From 8f402847a083d9740d33b9e2263ea69ef9a932ef Mon Sep 17 00:00:00 2001 From: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Thu, 12 Jun 2025 20:34:08 +0200 Subject: [PATCH] Init for multiloader --- .gitattributes | 15 ++ .gitignore | 24 ++ LICENSE | 121 +++++++++ README.md | 32 +++ build.gradle | 7 + buildSrc/build.gradle | 3 + .../src/main/groovy/multiloader-common.gradle | 133 ++++++++++ .../src/main/groovy/multiloader-loader.gradle | 44 +++ common/build.gradle | 47 ++++ .../BookshelfInspector.java | 24 ++ .../BookshelfInspectorClient.java | 23 ++ .../bookshelfinspector/Constants.java | 17 ++ .../bookshelfinspector/config/Config.java | 67 +++++ .../bookshelfinspector/data/BookData.java | 20 ++ .../data/BookShelfData.java | 10 + .../bookshelfinspector/data/Tags.java | 10 + .../mixin/BookshelfInvoker.java | 15 ++ .../mixin/BookshelfMixin.java | 25 ++ .../mixin/InGameHudMixin.java | 24 ++ .../bookshelfinspector/network/Handlers.java | 21 ++ .../BookShelfInventoryHandlerServer.java | 24 ++ .../client/ModServerPayloadHandler.java | 15 ++ .../packets/BookShelfInventoryPayload.java | 22 ++ .../BookShelfInventoryRequestPayload.java | 22 ++ .../LecternInventoryRequestPayload.java | 20 ++ .../network/packets/ModCheckPayload.java | 20 ++ ...fInventoryRequestServerPayloadHandler.java | 25 ++ ...nInventoryRequestServerPayloadHandler.java | 26 ++ .../bookshelfinspector/platform/Services.java | 34 +++ .../handlers/ClientPayloadHandler.java | 8 + .../handlers/OnPlayerDisconnectEvent.java | 5 + .../platform/handlers/OnPlayerJoinEvent.java | 8 + .../handlers/ServerPayloadHandler.java | 8 + .../platform/services/IEventHelper.java | 9 + .../platform/services/INetworkHelper.java | 9 + .../platform/services/IPlatformHelper.java | 20 ++ .../renderer/HudRenderer.java | 90 +++++++ .../renderer/Inspector.java | 121 +++++++++ .../util/BookshelfTools.java | 28 ++ .../bookshelfinspector/util/LecternTools.java | 24 ++ .../util/RomanNumerals.java | 33 +++ .../assets/bookshelfinspector/icon.png | Bin 0 -> 61927 bytes .../assets/bookshelfinspector/lang/en_us.json | 10 + .../assets/bookshelfinspector/lang/sv_se.json | 10 + .../resources/bookshelfinspector-config.yml | 3 + .../resources/bookshelfinspector.mixins.json | 19 ++ .../c/tags/block/chiseled_bookshelves.json | 6 + common/src/main/resources/pack.mcmeta | 6 + fabric/build.gradle | 46 ++++ .../BookshelfInspectorFabric.java | 33 +++ .../BookshelfInspectorFabricClient.java | 19 ++ .../lukasabbe/bookshelfinspector/ModMenu.java | 42 +++ .../platform/FabricEventHelper.java | 19 ++ .../platform/FabricNetworkHelper.java | 20 ++ .../platform/FabricPlatformHelper.java | 39 +++ ...lfinspector.platform.services.IEventHelper | 1 + ...inspector.platform.services.INetworkHelper | 1 + ...nspector.platform.services.IPlatformHelper | 1 + fabric/src/main/resources/fabric.mod.json | 38 +++ gradle.properties | 44 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ neoforge/build.gradle | 46 ++++ .../BookshelfInspectorNeoForge.java | 18 ++ .../BookshelfInspectorNeoForgeClient.java | 12 + .../ClothConfigGenerator.java | 38 +++ .../bookshelfinspector/EventHandler.java | 30 +++ .../bookshelfinspector/NetworkHandler.java | 40 +++ .../platform/NeoForgeEventHelper.java | 18 ++ .../platform/NeoForgeNetworkHelper.java | 18 ++ .../platform/NeoForgePlatformHelper.java | 43 +++ .../resources/META-INF/neoforge.mods.toml | 34 +++ ...lfinspector.platform.services.IEventHelper | 1 + ...inspector.platform.services.INetworkHelper | 1 + ...nspector.platform.services.IPlatformHelper | 1 + settings.gradle | 51 ++++ 78 files changed, 2313 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 build.gradle create mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/src/main/groovy/multiloader-common.gradle create mode 100644 buildSrc/src/main/groovy/multiloader-loader.gradle create mode 100644 common/build.gradle create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspector.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorClient.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/Constants.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/config/Config.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/data/BookData.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/data/BookShelfData.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/data/Tags.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/network/Handlers.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/network/client/BookShelfInventoryHandlerServer.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/network/client/ModServerPayloadHandler.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/BookShelfInventoryPayload.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/BookShelfInventoryRequestPayload.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/LecternInventoryRequestPayload.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/ModCheckPayload.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/BookShelfInventoryRequestServerPayloadHandler.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/LecternInventoryRequestServerPayloadHandler.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/platform/Services.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/ClientPayloadHandler.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/OnPlayerDisconnectEvent.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/OnPlayerJoinEvent.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/ServerPayloadHandler.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IEventHelper.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/INetworkHelper.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IPlatformHelper.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/Inspector.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/util/BookshelfTools.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/util/LecternTools.java create mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/util/RomanNumerals.java create mode 100644 common/src/main/resources/assets/bookshelfinspector/icon.png create mode 100644 common/src/main/resources/assets/bookshelfinspector/lang/en_us.json create mode 100644 common/src/main/resources/assets/bookshelfinspector/lang/sv_se.json create mode 100644 common/src/main/resources/bookshelfinspector-config.yml create mode 100644 common/src/main/resources/bookshelfinspector.mixins.json create mode 100644 common/src/main/resources/data/c/tags/block/chiseled_bookshelves.json create mode 100644 common/src/main/resources/pack.mcmeta create mode 100644 fabric/build.gradle create mode 100644 fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabric.java create mode 100644 fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabricClient.java create mode 100644 fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java create mode 100644 fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricEventHelper.java create mode 100644 fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricNetworkHelper.java create mode 100644 fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricPlatformHelper.java create mode 100644 fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IEventHelper create mode 100644 fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper create mode 100644 fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper create mode 100644 fabric/src/main/resources/fabric.mod.json create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 neoforge/build.gradle create mode 100644 neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForge.java create mode 100644 neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForgeClient.java create mode 100644 neoforge/src/main/java/com/lukasabbe/bookshelfinspector/ClothConfigGenerator.java create mode 100644 neoforge/src/main/java/com/lukasabbe/bookshelfinspector/EventHandler.java create mode 100644 neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java create mode 100644 neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeEventHelper.java create mode 100644 neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeNetworkHelper.java create mode 100644 neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgePlatformHelper.java create mode 100644 neoforge/src/main/resources/META-INF/neoforge.mods.toml create mode 100644 neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IEventHelper create mode 100644 neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper create mode 100644 neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper create mode 100644 settings.gradle diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..20fc528 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,15 @@ +* text eol=lf +*.bat text eol=crlf +*.patch text eol=lf +*.java text eol=lf +*.gradle text eol=crlf +*.png binary +*.gif binary +*.exe binary +*.dll binary +*.jar binary +*.lzma binary +*.zip binary +*.pyd binary +*.cfg text eol=lf +*.jks binary \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..461017f --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea/* +!.idea/scopes + +# gradle +build +.gradle + +# other +eclipse +run +runs diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/README.md b/README.md new file mode 100644 index 0000000..9959f78 --- /dev/null +++ b/README.md @@ -0,0 +1,32 @@ +# MultiLoader Template + +This project provides a Gradle project template that can compile Minecraft mods for multiple modloaders using a common project for the sources. This project does not require any third party libraries or dependencies. If you have any questions or want to discuss the project, please join our [Discord](https://discord.myceliummod.network). + +## Getting Started + +### IntelliJ IDEA +This guide will show how to import the MultiLoader Template into IntelliJ IDEA. The setup process is roughly equivalent to setting up the modloaders independently and should be very familiar to anyone who has worked with their MDKs. + +1. Clone or download this repository to your computer. +2. Configure the project by setting the properties in the `gradle.properties` file. You will also need to change the `rootProject.name` property in `settings.gradle`, this should match the folder name of your project, or else IDEA may complain. +3. Open the template's root folder as a new project in IDEA. This is the folder that contains this README.md file and the gradlew executable. +4. If your default JVM/JDK is not Java 21 you will encounter an error when opening the project. This error is fixed by going to `File > Settings > Build, Execution, Deployment > Build Tools > Gradle > Gradle JVM` and changing the value to a valid Java 21 JVM. You will also need to set the Project SDK to Java 21. This can be done by going to `File > Project Structure > Project SDK`. Once both have been set open the Gradle tab in IDEA and click the refresh button to reload the project. +5. Open your Run/Debug Configurations. Under the `Application` category there should now be options to run Fabric and NeoForge projects. Select one of the client options and try to run it. +6. Assuming you were able to run the game in step 5 your workspace should now be set up. + +### Eclipse +While it is possible to use this template in Eclipse it is not recommended. During the development of this template multiple critical bugs and quirks related to Eclipse were found at nearly every level of the required build tools. While we continue to work with these tools to report and resolve issues support for projects like these are not there yet. For now Eclipse is considered unsupported by this project. The development cycle for build tools is notoriously slow so there are no ETAs available. + +## Development Guide +When using this template the majority of your mod should be developed in the `common` project. The `common` project is compiled against the vanilla game and is used to hold code that is shared between the different loader-specific versions of your mod. The `common` project has no knowledge or access to ModLoader specific code, apis, or concepts. Code that requires something from a specific loader must be done through the project that is specific to that loader, such as the `fabric` or `neoforge` projects. + +Loader specific projects such as the `fabric` and `neoforge` project are used to load the `common` project into the game. These projects also define code that is specific to that loader. Loader specific projects can access all the code in the `common` project. It is important to remember that the `common` project can not access code from loader specific projects. + +## Removing Platforms and Loaders +While this template has support for many modloaders, new loaders may appear in the future, and existing loaders may become less relevant. + +Removing loader specific projects is as easy as deleting the folder, and removing the `include("projectname")` line from the `settings.gradle` file. +For example if you wanted to remove support for `forge` you would follow the following steps: + +1. Delete the subproject folder. For example, delete `MultiLoader-Template/forge`. +2. Remove the project from `settings.gradle`. For example, remove `include("forge")`. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..be69c12 --- /dev/null +++ b/build.gradle @@ -0,0 +1,7 @@ +plugins { + // see https://fabricmc.net/develop/ for new versions + id 'fabric-loom' version '1.10-SNAPSHOT' apply false + // see https://projects.neoforged.net/neoforged/moddevgradle for new versions + id 'net.neoforged.moddev' version '2.0.62-beta' apply false + +} \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 0000000..6784052 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'groovy-gradle-plugin' +} diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle new file mode 100644 index 0000000..3bc7e6a --- /dev/null +++ b/buildSrc/src/main/groovy/multiloader-common.gradle @@ -0,0 +1,133 @@ +plugins { + id 'java-library' + id 'maven-publish' +} + +base { + archivesName = "${mod_id}-${project.name}-${minecraft_version}" +} + +java { + toolchain.languageVersion = JavaLanguageVersion.of(java_version) + withSourcesJar() + withJavadocJar() +} + +repositories { + mavenCentral() + // https://docs.gradle.org/current/userguide/declaring_repositories.html#declaring_content_exclusively_found_in_one_repository + exclusiveContent { + forRepository { + maven { + name = 'Sponge' + url = 'https://repo.spongepowered.org/repository/maven-public' + } + } + filter { includeGroupAndSubgroups('org.spongepowered') } + } + exclusiveContent { + forRepositories( + maven { + name = 'ParchmentMC' + url = 'https://maven.parchmentmc.org/' + }, + maven { + name = "NeoForge" + url = 'https://maven.neoforged.net/releases' + } + ) + filter { includeGroup('org.parchmentmc.data') } + } + maven { + name = 'BlameJared' + url = 'https://maven.blamejared.com' + } +} + +// Declare capabilities on the outgoing configurations. +// Read more about capabilities here: https://docs.gradle.org/current/userguide/component_capabilities.html#sec:declaring-additional-capabilities-for-a-local-component +['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant -> + configurations."$variant".outgoing { + capability("$group:${project.name}:$version") + capability("$group:${base.archivesName.get()}:$version") + capability("$group:$mod_id-${project.name}-${minecraft_version}:$version") + capability("$group:$mod_id:$version") + } + publishing.publications.configureEach { + suppressPomMetadataWarningsFor(variant) + } +} + +sourcesJar { + from(rootProject.file('LICENSE')) { + rename { "${it}_${mod_name}" } + } +} + +jar { + from(rootProject.file('LICENSE')) { + rename { "${it}_${mod_name}" } + } + + manifest { + attributes([ + 'Specification-Title' : mod_name, + 'Specification-Vendor' : mod_author, + 'Specification-Version' : project.jar.archiveVersion, + 'Implementation-Title' : project.name, + 'Implementation-Version': project.jar.archiveVersion, + 'Implementation-Vendor' : mod_author, + 'Built-On-Minecraft' : minecraft_version + ]) + } +} + +processResources { + var expandProps = [ + 'version' : version, + 'group' : project.group, //Else we target the task's group. + 'minecraft_version' : minecraft_version, + 'minecraft_version_range' : minecraft_version_range, + 'fabric_version' : fabric_version, + 'fabric_loader_version' : fabric_loader_version, + 'mod_name' : mod_name, + 'mod_author' : mod_author, + 'mod_id' : mod_id, + 'license' : license, + 'description' : project.description, + 'neoforge_version' : neoforge_version, + 'neoforge_loader_version_range': neoforge_loader_version_range, + "forge_version": forge_version, + "forge_loader_version_range": forge_loader_version_range, + 'credits' : credits, + 'java_version' : java_version + ] + + var jsonExpandProps = expandProps.collectEntries { + key, value -> [(key): value instanceof String ? value.replace("\n", "\\\\n") : value] + } + + filesMatching(['META-INF/mods.toml', 'META-INF/neoforge.mods.toml']) { + expand expandProps + } + + filesMatching(['pack.mcmeta', 'fabric.mod.json', '*.mixins.json']) { + expand jsonExpandProps + } + + inputs.properties(expandProps) +} + +publishing { + publications { + register('mavenJava', MavenPublication) { + artifactId base.archivesName.get() + from components.java + } + } + repositories { + maven { + url System.getenv('local_maven_url') + } + } +} diff --git a/buildSrc/src/main/groovy/multiloader-loader.gradle b/buildSrc/src/main/groovy/multiloader-loader.gradle new file mode 100644 index 0000000..92e2325 --- /dev/null +++ b/buildSrc/src/main/groovy/multiloader-loader.gradle @@ -0,0 +1,44 @@ +plugins { + id 'multiloader-common' +} + +configurations { + commonJava{ + canBeResolved = true + } + commonResources{ + canBeResolved = true + } +} + +dependencies { + compileOnly(project(':common')) { + capabilities { + requireCapability "$group:$mod_id" + } + } + commonJava project(path: ':common', configuration: 'commonJava') + commonResources project(path: ':common', configuration: 'commonResources') +} + +tasks.named('compileJava', JavaCompile) { + dependsOn(configurations.commonJava) + source(configurations.commonJava) +} + +processResources { + dependsOn(configurations.commonResources) + from(configurations.commonResources) +} + +tasks.named('javadoc', Javadoc).configure { + dependsOn(configurations.commonJava) + source(configurations.commonJava) +} + +tasks.named('sourcesJar', Jar) { + dependsOn(configurations.commonJava) + from(configurations.commonJava) + dependsOn(configurations.commonResources) + from(configurations.commonResources) +} diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..40d3908 --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,47 @@ +plugins { + id 'multiloader-common' + id 'net.neoforged.moddev' +} + +neoForge { + neoFormVersion = neo_form_version + // Automatically enable AccessTransformers if the file exists + def at = file('src/main/resources/META-INF/accesstransformer.cfg') + if (at.exists()) { + accessTransformers.from(at.absolutePath) + } + parchment { + minecraftVersion = parchment_minecraft + mappingsVersion = parchment_version + } +} + +dependencies { + compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5' + // fabric and neoforge both bundle mixinextras, so it is safe to use it in common + compileOnly group: 'io.github.llamalad7', name: 'mixinextras-common', version: '0.3.5' + annotationProcessor group: 'io.github.llamalad7', name: 'mixinextras-common', version: '0.3.5' + implementation "org.yaml:snakeyaml:${project.YAML_snake}" +} + + +configurations { + shadowCommon + implementation.extendsFrom shadowCommon + runtimeClasspath.extendsFrom shadowCommon + + commonJava { + canBeResolved = false + canBeConsumed = true + } + commonResources { + canBeResolved = false + canBeConsumed = true + } +} + +artifacts { + commonJava sourceSets.main.java.sourceDirectories.singleFile + commonResources sourceSets.main.resources.sourceDirectories.singleFile +} + diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspector.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspector.java new file mode 100644 index 0000000..e41689d --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspector.java @@ -0,0 +1,24 @@ +package com.lukasabbe.bookshelfinspector; + +import com.lukasabbe.bookshelfinspector.network.Handlers; +import com.lukasabbe.bookshelfinspector.network.packets.ModCheckPayload; +import com.lukasabbe.bookshelfinspector.platform.Services; +import net.minecraft.server.MinecraftServer; + +public class BookshelfInspector { + public static MinecraftServer serverInstance; + public static Handlers networkHandlers; + + public static void init() { + registerEvents(); + networkHandlers = new Handlers(); + } + + private static void registerEvents(){ + Services.EVENTS_HELPER.registerOnPlayerJoinEvent((player, server) -> { + serverInstance = server; + Services.NETWORK_HELPER.sendPacketFromServer(player, new ModCheckPayload(true)); + }); + } + +} \ No newline at end of file diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorClient.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorClient.java new file mode 100644 index 0000000..ac978db --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorClient.java @@ -0,0 +1,23 @@ +package com.lukasabbe.bookshelfinspector; + +import com.lukasabbe.bookshelfinspector.config.Config; +import com.lukasabbe.bookshelfinspector.data.BookData; +import com.lukasabbe.bookshelfinspector.data.BookShelfData; +import com.lukasabbe.bookshelfinspector.platform.Services; + +public class BookshelfInspectorClient { + public static BookData currentBookData = BookData.empty(); + public static BookShelfData bookShelfData = new BookShelfData(); + public static boolean modAvailable = false; + public static Config config = new Config(); + + public static void clientInit(){ + config.loadConfig(); + + Services.EVENTS_HELPER.registerOnPlayerDisconnect(() -> { + modAvailable = false; + bookShelfData = new BookShelfData(); + }); + + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/Constants.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/Constants.java new file mode 100644 index 0000000..33c9951 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/Constants.java @@ -0,0 +1,17 @@ +package com.lukasabbe.bookshelfinspector; + +import net.minecraft.resources.ResourceLocation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class Constants { + public static final String MOD_ID = "bookshelfinspector"; + public static final String MOD_NAME = "Bookshelf Inspector"; + public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME); + + //Packets + public static final ResourceLocation BOOK_SHELF_INVENTORY_REQUEST_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"book_shelf_inventory_request"); + public static final ResourceLocation BOOK_SHELF_INVENTORY_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"book_shelf_inventory"); + public static final ResourceLocation MOD_CHECK_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"mod_check"); + public static final ResourceLocation LECTERN_INVENTORY_REQUEST_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID, "lectern_inventory_request"); +} \ No newline at end of file diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/config/Config.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/config/Config.java new file mode 100644 index 0000000..131538e --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/config/Config.java @@ -0,0 +1,67 @@ +package com.lukasabbe.bookshelfinspector.config; + +import com.lukasabbe.bookshelfinspector.platform.Services; +import org.yaml.snakeyaml.Yaml; + + +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Map; + +public class Config { + public boolean lecternToggle = true; + public int scale = 10; + public boolean useRoman = false; + + public void loadConfig(){ + Path configPath = Services.PLATFORM.getConfigPath("bookshelfinspector-config.yml"); + if(!Files.exists(configPath))createConfig(configPath); + Yaml yaml = new Yaml(); + try{ + Map configMap = yaml.load(new FileReader(configPath.toFile())); + if(configMap.containsKey("lectern-toggle")){ + lecternToggle = (boolean) configMap.get("lectern-toggle"); + } + if(configMap.containsKey("scale")){ + scale = (int) configMap.get("scale"); + } + if(configMap.containsKey("roman")){ + useRoman = (boolean) configMap.get("roman"); + } + + } catch (FileNotFoundException e) { + throw new RuntimeException(e); + } + } + + private void createConfig(Path configPath){ + Path defaultConfigPath = Services.PLATFORM.getFileInModContainer("bookshelfinspector", "bookshelfinspector-config.yml"); + try { + Files.copy(defaultConfigPath, configPath); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public void saveConfig(){ + Path configPath = Services.PLATFORM.getConfigPath("bookshelfinspector-config.yml"); + if(!Files.exists(configPath)) createConfig(configPath); + Yaml yaml = new Yaml(); + try{ + Map configMap = yaml.load(new FileReader(configPath.toFile())); + configMap.put("lectern-toggle",lecternToggle); + configMap.put("scale",scale); + configMap.put("roman", useRoman); + FileWriter writer = new FileWriter(configPath.toString()); + yaml.dump(configMap,writer); + writer.close(); + + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/data/BookData.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/data/BookData.java new file mode 100644 index 0000000..970d547 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/data/BookData.java @@ -0,0 +1,20 @@ +package com.lukasabbe.bookshelfinspector.data; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.item.ItemStack; + +public class BookData { + public ItemStack itemStack; + public BlockPos pos; + public int slotId; + + public BookData(ItemStack itemStack, BlockPos pos, int slotId) { + this.itemStack = itemStack; + this.pos = pos; + this.slotId = slotId; + } + + public static BookData empty(){ + return new BookData(ItemStack.EMPTY, null, -1); + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/data/BookShelfData.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/data/BookShelfData.java new file mode 100644 index 0000000..a3ae45a --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/data/BookShelfData.java @@ -0,0 +1,10 @@ +package com.lukasabbe.bookshelfinspector.data; + +import net.minecraft.core.BlockPos; + +public class BookShelfData { + public boolean isCurrentBookDataToggled = false; + public BlockPos latestPos = null; + public boolean requestSent = false; + public int currentSlotInt = -1; +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/data/Tags.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/data/Tags.java new file mode 100644 index 0000000..ca64b70 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/data/Tags.java @@ -0,0 +1,10 @@ +package com.lukasabbe.bookshelfinspector.data; + +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; + +public class Tags { + public static final TagKey CHISELED_BOOKSHELVES = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "chiseled_bookshelves")); +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java new file mode 100644 index 0000000..22cb6d8 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java @@ -0,0 +1,15 @@ +package com.lukasabbe.bookshelfinspector.mixin; + +import net.minecraft.world.level.block.ChiseledBookShelfBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +import java.util.OptionalInt; + +@Mixin(ChiseledBookShelfBlock.class) +public interface BookshelfInvoker { + @Invoker("getHitSlot") + OptionalInt invokerGetSlotForHitPos(BlockHitResult hit, BlockState state); +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java new file mode 100644 index 0000000..65b5fcd --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java @@ -0,0 +1,25 @@ +package com.lukasabbe.bookshelfinspector.mixin; + +import com.lukasabbe.bookshelfinspector.Constants; +import com.lukasabbe.bookshelfinspector.renderer.Inspector; +import net.minecraft.client.Minecraft; +import net.minecraft.client.player.LocalPlayer; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(LocalPlayer.class) +public class BookshelfMixin { + + @Shadow @Final protected Minecraft minecraft; + @Unique private final Inspector bookshelfInspectorMultiloader$inspector = new Inspector(); + + @Inject(method = "tick", at= @At(value = "INVOKE", target = "Ljava/util/List;iterator()Ljava/util/Iterator;")) + public void injectTick(CallbackInfo ci){ + bookshelfInspectorMultiloader$inspector.inspect(this.minecraft); + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java new file mode 100644 index 0000000..ebf8a57 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java @@ -0,0 +1,24 @@ +package com.lukasabbe.bookshelfinspector.mixin; + +import com.lukasabbe.bookshelfinspector.Constants; +import com.lukasabbe.bookshelfinspector.renderer.HudRenderer; +import net.minecraft.client.DeltaTracker; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.GuiGraphics; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Gui.class) +public class InGameHudMixin { + @Shadow @Final private Minecraft minecraft; + + @Inject(method = "render",at=@At("RETURN")) + public void render(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci){ + HudRenderer.hudRender(context, minecraft); + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/network/Handlers.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/Handlers.java new file mode 100644 index 0000000..ed355e9 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/Handlers.java @@ -0,0 +1,21 @@ +package com.lukasabbe.bookshelfinspector.network; + +import com.lukasabbe.bookshelfinspector.network.client.BookShelfInventoryHandlerServer; +import com.lukasabbe.bookshelfinspector.network.client.ModServerPayloadHandler; +import com.lukasabbe.bookshelfinspector.network.server.BookShelfInventoryRequestServerPayloadHandler; +import com.lukasabbe.bookshelfinspector.network.server.LecternInventoryRequestServerPayloadHandler; + +public class Handlers { + public BookShelfInventoryHandlerServer bookShelfInventoryHandlerServer; + public ModServerPayloadHandler modServerPayloadHandler; + public BookShelfInventoryRequestServerPayloadHandler bookShelfInventoryRequestServerPayloadHandler; + public LecternInventoryRequestServerPayloadHandler lecternInventoryRequestServerPayloadHandler; + + public Handlers(){ + bookShelfInventoryHandlerServer = new BookShelfInventoryHandlerServer(); + modServerPayloadHandler = new ModServerPayloadHandler(); + bookShelfInventoryRequestServerPayloadHandler = new BookShelfInventoryRequestServerPayloadHandler(); + lecternInventoryRequestServerPayloadHandler = new LecternInventoryRequestServerPayloadHandler(); + } + +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/network/client/BookShelfInventoryHandlerServer.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/client/BookShelfInventoryHandlerServer.java new file mode 100644 index 0000000..b0ae8b5 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/client/BookShelfInventoryHandlerServer.java @@ -0,0 +1,24 @@ +package com.lukasabbe.bookshelfinspector.network.client; + +import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient; +import com.lukasabbe.bookshelfinspector.data.BookData; +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayload; +import com.lukasabbe.bookshelfinspector.platform.handlers.ClientPayloadHandler; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.world.item.Items; + +public class BookShelfInventoryHandlerServer implements ClientPayloadHandler { + @Override + public void receive(BookShelfInventoryPayload bookShelfInventoryPayload, LocalPlayer player) { + BookshelfInspectorClient.bookShelfData.requestSent = false; + if(bookShelfInventoryPayload.itemStack().is(Items.AIR)){ + BookshelfInspectorClient.bookShelfData.isCurrentBookDataToggled = false; + BookshelfInspectorClient.currentBookData = BookData.empty(); + BookshelfInspectorClient.currentBookData.slotId = -2; + } + else{ + BookshelfInspectorClient.bookShelfData.isCurrentBookDataToggled = true; + BookshelfInspectorClient.currentBookData = new BookData(bookShelfInventoryPayload.itemStack(),bookShelfInventoryPayload.pos(),bookShelfInventoryPayload.slotNum()); + } + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/network/client/ModServerPayloadHandler.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/client/ModServerPayloadHandler.java new file mode 100644 index 0000000..16bd69c --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/client/ModServerPayloadHandler.java @@ -0,0 +1,15 @@ +package com.lukasabbe.bookshelfinspector.network.client; + +import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient; +import com.lukasabbe.bookshelfinspector.Constants; +import com.lukasabbe.bookshelfinspector.network.packets.ModCheckPayload; +import com.lukasabbe.bookshelfinspector.platform.handlers.ClientPayloadHandler; +import net.minecraft.client.player.LocalPlayer; + +public class ModServerPayloadHandler implements ClientPayloadHandler { + @Override + public void receive(ModCheckPayload payload, LocalPlayer player) { + Constants.LOG.info("[bookshelfinspector] Connected to server"); + BookshelfInspectorClient.modAvailable = true; + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/BookShelfInventoryPayload.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/BookShelfInventoryPayload.java new file mode 100644 index 0000000..e17ef02 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/BookShelfInventoryPayload.java @@ -0,0 +1,22 @@ +package com.lukasabbe.bookshelfinspector.network.packets; + +import com.lukasabbe.bookshelfinspector.Constants; +import net.minecraft.core.BlockPos; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; + +public record BookShelfInventoryPayload(ItemStack itemStack, BlockPos pos, int slotNum) implements CustomPacketPayload { + public static final CustomPacketPayload.Type ID = new CustomPacketPayload.Type<>(Constants.BOOK_SHELF_INVENTORY_PACKET_ID); + public static final StreamCodec CODEC = StreamCodec.composite( + ItemStack.OPTIONAL_STREAM_CODEC, BookShelfInventoryPayload::itemStack, + BlockPos.STREAM_CODEC, BookShelfInventoryPayload::pos, + ByteBufCodecs.INT, BookShelfInventoryPayload::slotNum, + BookShelfInventoryPayload::new + ); + @Override + public @NotNull Type type() { return ID; } +} \ No newline at end of file diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/BookShelfInventoryRequestPayload.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/BookShelfInventoryRequestPayload.java new file mode 100644 index 0000000..7e2922d --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/BookShelfInventoryRequestPayload.java @@ -0,0 +1,22 @@ +package com.lukasabbe.bookshelfinspector.network.packets; + +import com.lukasabbe.bookshelfinspector.Constants; +import net.minecraft.core.BlockPos; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import org.jetbrains.annotations.NotNull; + +public record BookShelfInventoryRequestPayload(BlockPos pos, int slotNum) implements CustomPacketPayload { + + public static final CustomPacketPayload.Type ID = new CustomPacketPayload.Type<>(Constants.BOOK_SHELF_INVENTORY_REQUEST_PACKET_ID); + + public static final StreamCodec CODEC = StreamCodec.composite( + BlockPos.STREAM_CODEC,BookShelfInventoryRequestPayload::pos, + ByteBufCodecs.INT, BookShelfInventoryRequestPayload::slotNum, + BookShelfInventoryRequestPayload::new); + + @Override + public @NotNull Type type() { return ID; } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/LecternInventoryRequestPayload.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/LecternInventoryRequestPayload.java new file mode 100644 index 0000000..434637a --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/LecternInventoryRequestPayload.java @@ -0,0 +1,20 @@ +package com.lukasabbe.bookshelfinspector.network.packets; + +import com.lukasabbe.bookshelfinspector.Constants; +import net.minecraft.core.BlockPos; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import org.jetbrains.annotations.NotNull; + +public record LecternInventoryRequestPayload(BlockPos pos) implements CustomPacketPayload { + + public static final CustomPacketPayload.Type ID = new CustomPacketPayload.Type<>(Constants.LECTERN_INVENTORY_REQUEST_PACKET_ID); + + public static final StreamCodec CODEC = StreamCodec.composite( + BlockPos.STREAM_CODEC,LecternInventoryRequestPayload::pos, + LecternInventoryRequestPayload::new); + + @Override + public @NotNull Type type() { return ID; } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/ModCheckPayload.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/ModCheckPayload.java new file mode 100644 index 0000000..e04161c --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/packets/ModCheckPayload.java @@ -0,0 +1,20 @@ +package com.lukasabbe.bookshelfinspector.network.packets; + +import com.lukasabbe.bookshelfinspector.Constants; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import org.jetbrains.annotations.NotNull; + +public record ModCheckPayload(boolean modActivated) implements CustomPacketPayload { + public static final CustomPacketPayload.Type ID = new CustomPacketPayload.Type<>(Constants.MOD_CHECK_PACKET_ID); + + public static final StreamCodec CODEC = StreamCodec.composite( + ByteBufCodecs.BOOL, ModCheckPayload::modActivated, + ModCheckPayload::new + ); + + @Override + public @NotNull Type type() { return ID; } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/BookShelfInventoryRequestServerPayloadHandler.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/BookShelfInventoryRequestServerPayloadHandler.java new file mode 100644 index 0000000..98d752a --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/BookShelfInventoryRequestServerPayloadHandler.java @@ -0,0 +1,25 @@ +package com.lukasabbe.bookshelfinspector.network.server; + +import com.lukasabbe.bookshelfinspector.BookshelfInspector; +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayload; +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload; +import com.lukasabbe.bookshelfinspector.platform.Services; +import com.lukasabbe.bookshelfinspector.platform.handlers.ServerPayloadHandler; +import com.lukasabbe.bookshelfinspector.util.BookshelfTools; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; + +public class BookShelfInventoryRequestServerPayloadHandler implements ServerPayloadHandler { + @Override + public void receive(BookShelfInventoryRequestPayload bookShelfInventoryRequestPayload, ServerPlayer player) { + if(BookshelfInspector.serverInstance == null) return; + + ItemStack stack = BookshelfTools.getItemById(bookShelfInventoryRequestPayload.pos(),bookShelfInventoryRequestPayload.slotNum(), player); + if(stack == null){ + Services.NETWORK_HELPER.sendPacketFromServer(player, new BookShelfInventoryPayload(Items.AIR.getDefaultInstance(), bookShelfInventoryRequestPayload.pos(), bookShelfInventoryRequestPayload.slotNum())); + return; + } + Services.NETWORK_HELPER.sendPacketFromServer(player, new BookShelfInventoryPayload(stack, bookShelfInventoryRequestPayload.pos(), bookShelfInventoryRequestPayload.slotNum())); + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/LecternInventoryRequestServerPayloadHandler.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/LecternInventoryRequestServerPayloadHandler.java new file mode 100644 index 0000000..f54d602 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/LecternInventoryRequestServerPayloadHandler.java @@ -0,0 +1,26 @@ +package com.lukasabbe.bookshelfinspector.network.server; + +import com.lukasabbe.bookshelfinspector.BookshelfInspector; +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayload; +import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload; +import com.lukasabbe.bookshelfinspector.platform.Services; +import com.lukasabbe.bookshelfinspector.platform.handlers.ServerPayloadHandler; +import com.lukasabbe.bookshelfinspector.util.LecternTools; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; + +public class LecternInventoryRequestServerPayloadHandler implements ServerPayloadHandler { + @Override + public void receive(LecternInventoryRequestPayload lecternInventoryRequestPayload, ServerPlayer player) { + if(BookshelfInspector.serverInstance == null) return; + + ItemStack stack = LecternTools.getItemStack(lecternInventoryRequestPayload.pos(), player); + + if(stack == null){ + Services.NETWORK_HELPER.sendPacketFromServer(player, new BookShelfInventoryPayload(Items.AIR.getDefaultInstance(), lecternInventoryRequestPayload.pos(), 0)); + return; + } + Services.NETWORK_HELPER.sendPacketFromServer(player, new BookShelfInventoryPayload(stack, lecternInventoryRequestPayload.pos(), 0)); + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/Services.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/Services.java new file mode 100644 index 0000000..037104b --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/Services.java @@ -0,0 +1,34 @@ +package com.lukasabbe.bookshelfinspector.platform; + +import com.lukasabbe.bookshelfinspector.Constants; +import com.lukasabbe.bookshelfinspector.platform.services.IEventHelper; +import com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper; +import com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper; + +import java.util.ServiceLoader; + +// Service loaders are a built-in Java feature that allow us to locate implementations of an interface that vary from one +// environment to another. In the context of MultiLoader we use this feature to access a mock API in the common code that +// is swapped out for the platform specific implementation at runtime. +public class Services { + + // In this example we provide a platform helper which provides information about what platform the mod is running on. + // For example this can be used to check if the code is running on Forge vs Fabric, or to ask the modloader if another + // mod is loaded. + public static final IPlatformHelper PLATFORM = load(IPlatformHelper.class); + public static final INetworkHelper NETWORK_HELPER = load(INetworkHelper.class); + public static final IEventHelper EVENTS_HELPER = load(IEventHelper.class); + + // This code is used to load a service for the current environment. Your implementation of the service must be defined + // manually by including a text file in META-INF/services named with the fully qualified class name of the service. + // Inside the file you should write the fully qualified class name of the implementation to load for the platform. For + // example our file on Forge points to ForgePlatformHelper while Fabric points to FabricPlatformHelper. + public static T load(Class clazz) { + + final T loadedService = ServiceLoader.load(clazz) + .findFirst() + .orElseThrow(() -> new NullPointerException("Failed to load service for " + clazz.getName())); + Constants.LOG.debug("Loaded {} for service {}", loadedService, clazz); + return loadedService; + } +} \ No newline at end of file diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/ClientPayloadHandler.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/ClientPayloadHandler.java new file mode 100644 index 0000000..41d96f9 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/ClientPayloadHandler.java @@ -0,0 +1,8 @@ +package com.lukasabbe.bookshelfinspector.platform.handlers; + +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +public interface ClientPayloadHandler { + void receive(T payload, LocalPlayer player); +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/OnPlayerDisconnectEvent.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/OnPlayerDisconnectEvent.java new file mode 100644 index 0000000..844b258 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/OnPlayerDisconnectEvent.java @@ -0,0 +1,5 @@ +package com.lukasabbe.bookshelfinspector.platform.handlers; + +public interface OnPlayerDisconnectEvent { + void onDisconnect(); +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/OnPlayerJoinEvent.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/OnPlayerJoinEvent.java new file mode 100644 index 0000000..7d044c8 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/OnPlayerJoinEvent.java @@ -0,0 +1,8 @@ +package com.lukasabbe.bookshelfinspector.platform.handlers; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; + +public interface OnPlayerJoinEvent { + void onPlayerJoin(ServerPlayer handler, MinecraftServer server); +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/ServerPayloadHandler.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/ServerPayloadHandler.java new file mode 100644 index 0000000..85f9e71 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/handlers/ServerPayloadHandler.java @@ -0,0 +1,8 @@ +package com.lukasabbe.bookshelfinspector.platform.handlers; + +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; + +public interface ServerPayloadHandler { + void receive(T payload, ServerPlayer player); +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IEventHelper.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IEventHelper.java new file mode 100644 index 0000000..497e8cd --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IEventHelper.java @@ -0,0 +1,9 @@ +package com.lukasabbe.bookshelfinspector.platform.services; + +import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerDisconnectEvent; +import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerJoinEvent; + +public interface IEventHelper { + void registerOnPlayerJoinEvent(OnPlayerJoinEvent event); + void registerOnPlayerDisconnect(OnPlayerDisconnectEvent event); +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/INetworkHelper.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/INetworkHelper.java new file mode 100644 index 0000000..35eea0f --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/INetworkHelper.java @@ -0,0 +1,9 @@ +package com.lukasabbe.bookshelfinspector.platform.services; + +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; + +public interface INetworkHelper { + void sendPacketFromServer(ServerPlayer player, CustomPacketPayload payload); + void sendPacketFromClient(CustomPacketPayload payload); +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IPlatformHelper.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IPlatformHelper.java new file mode 100644 index 0000000..6cc619a --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IPlatformHelper.java @@ -0,0 +1,20 @@ +package com.lukasabbe.bookshelfinspector.platform.services; + +import java.nio.file.Path; + +public interface IPlatformHelper { + String getPlatformName(); + + boolean isModLoaded(String modId); + + boolean isDevelopmentEnvironment(); + + Path getConfigPath(String file); + + Path getFileInModContainer(String mod, String fileName); + + default String getEnvironmentName() { + + return isDevelopmentEnvironment() ? "development" : "production"; + } +} \ No newline at end of file diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java new file mode 100644 index 0000000..61141b4 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java @@ -0,0 +1,90 @@ +package com.lukasabbe.bookshelfinspector.renderer; + +import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient; +import com.lukasabbe.bookshelfinspector.Constants; +import com.lukasabbe.bookshelfinspector.data.BookData; +import com.lukasabbe.bookshelfinspector.util.RomanNumerals; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.core.Holder; +import net.minecraft.core.component.DataComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentUtils; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.Style; +import net.minecraft.tags.EnchantmentTags; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.item.enchantment.ItemEnchantments; + +public class HudRenderer { + public static void hudRender(GuiGraphics context, Minecraft client){ + if(!BookshelfInspectorClient.modAvailable) return; + if(client.options.hideGui) return; + if(!BookshelfInspectorClient.bookShelfData.isCurrentBookDataToggled) return; + + final BookData currentBookData = BookshelfInspectorClient.currentBookData; + final int screenWidth = client.getWindow().getGuiScaledWidth(); + final int screenHeight = client.getWindow().getGuiScaledHeight(); + final int x = screenWidth / 2; + final int y = screenHeight / 2; + final ItemStack itemStack = currentBookData.itemStack; + + int color = 0xFFFFFFFF; + + final Integer colorValue = itemStack.getRarity().color().getColor(); + + if(colorValue != null){ + color = colorValue; + } + + float scaleFactor = ((float) BookshelfInspectorClient.config.scale /10); + drawScaledText(context, itemStack.getHoverName(), x,y+((int)(10*scaleFactor)), color, client.font); + + ItemEnchantments storedComponents = itemStack.getComponents().get(DataComponents.STORED_ENCHANTMENTS); + if(storedComponents != null){ + int i = ((int)(20*scaleFactor)); + for(Holder enchantment : storedComponents.keySet()){ + String lvl = ""; + final int level = storedComponents.getLevel(enchantment); + if(level != 1) + lvl = String.valueOf(level); + final MutableComponent enchantmentText; + + if(!BookshelfInspectorClient.config.useRoman || level == -1) + enchantmentText = enchantment.value().description().copy().append(" " + lvl); + else if (level != 1) + enchantmentText = enchantment.value().description().copy().append(" " + RomanNumerals.toRoman(level)); + else + enchantmentText = enchantment.value().description().copy(); + + if(enchantment.is(EnchantmentTags.CURSE)) { + ComponentUtils.mergeStyles(enchantmentText, Style.EMPTY.withColor(ChatFormatting.RED)); + }else { + ComponentUtils.mergeStyles(enchantmentText, Style.EMPTY.withColor(ChatFormatting.GRAY)); + } + drawScaledText(context, enchantmentText, x,y+i, 0xFFFFFFFF,client.font); + i+=(int)(10*scaleFactor); + } + } + + var writtenBookContentComponent = itemStack.getComponents().get(DataComponents.WRITTEN_BOOK_CONTENT); + + if(writtenBookContentComponent != null){ + drawScaledText(context, Component.translatable("book.byAuthor",writtenBookContentComponent.author()), x,y+(int)(20*scaleFactor), 0xFFFFFFFF, client.font); + } + } + private static void drawScaledText(GuiGraphics context, Component text, int centerX, int y, int color, Font textRenderer){ + PoseStack stack = context.pose(); + stack.pushPose(); + stack.translate(centerX,y,0); + final float scale = (float) BookshelfInspectorClient.config.scale / 10; + stack.scale(scale, scale, scale); + stack.translate(-centerX,-y,0); + context.drawCenteredString(textRenderer,text,centerX,y,color); + stack.popPose(); + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/Inspector.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/Inspector.java new file mode 100644 index 0000000..a936ba3 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/Inspector.java @@ -0,0 +1,121 @@ +package com.lukasabbe.bookshelfinspector.renderer; + +import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient; +import com.lukasabbe.bookshelfinspector.data.BookData; +import com.lukasabbe.bookshelfinspector.data.Tags; +import com.lukasabbe.bookshelfinspector.mixin.BookshelfInvoker; +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload; +import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload; +import com.lukasabbe.bookshelfinspector.platform.Services; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.ChiseledBookShelfBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; + +import java.util.OptionalInt; + +import static com.lukasabbe.bookshelfinspector.BookshelfInspectorClient.*; + +public class Inspector { + public void inspect(Minecraft client){ + if(!modAvailable) return; + + if(client.cameraEntity == null || client.player == null) return; + + //Send raycast max 5 blocks + HitResult hit = client.cameraEntity.pick(5f,0f,false); + + //find block hit, if not found block returns + final HitResult.Type type = hit.getType(); + if(type != HitResult.Type.BLOCK) { + resetBookShelfData(); + return; + } + + final BlockHitResult blockHitResult = (BlockHitResult) hit; + BlockPos pos = blockHitResult.getBlockPos(); + + if(bookShelfData.latestPos == null) + bookShelfData.latestPos = pos; + + //If you look at a new block + if(!bookShelfData.latestPos.equals(pos)){ + resetBookShelfData(); + currentBookData = BookData.empty(); + } + bookShelfData.latestPos = pos; + + + if(client.player.level().getBlockState(pos).is(Tags.CHISELED_BOOKSHELVES)){ + bookShelfInspect(pos, blockHitResult, client); + }else if(client.player.level().getBlockState(pos).is(Blocks.LECTERN) && config.lecternToggle){ + lecternInspect(pos); + }else{ + + bookShelfData.requestSent = false; // Just for servers that don't have the latest version of mod + + if(!bookShelfData.isCurrentBookDataToggled) return; + resetBookShelfData(); + } + } + + + private void lecternInspect(BlockPos pos){ + + //Checks if there is saved data. + final BookData currentBookData = BookshelfInspectorClient.currentBookData; + + if(currentBookData.pos != null && currentBookData.pos.equals(pos)) return; + + if(!bookShelfData.requestSent){ + bookShelfData.requestSent = true; + Services.NETWORK_HELPER.sendPacketFromClient(new LecternInventoryRequestPayload(pos)); + } + } + + + private void bookShelfInspect(BlockPos pos, BlockHitResult blockHitResult, Minecraft client){ + final BlockState blockState = client.player.level().getBlockState(pos); + + //Gets index position for a book in the bookshelf + ChiseledBookShelfBlock bookshelfBlock = (ChiseledBookShelfBlock) blockState.getBlock(); + OptionalInt optionalInt = ((BookshelfInvoker)bookshelfBlock).invokerGetSlotForHitPos(blockHitResult,blockState); + + //if the position is empty, return + if(optionalInt.isEmpty()) { + resetBookShelfData(); + return; + } + + //Checks if there is saved data. + final BookData currentBookData = BookshelfInspectorClient.currentBookData; + + //Changes the id for the new one if it's new. + final int temp = bookShelfData.currentSlotInt; + final int slotNum = optionalInt.getAsInt(); + bookShelfData.currentSlotInt = slotNum; + + if(currentBookData.slotId!= slotNum && currentBookData.slotId!=-2 && !bookShelfData.requestSent){ + bookShelfData.requestSent = true; + Services.NETWORK_HELPER.sendPacketFromClient(new BookShelfInventoryRequestPayload(pos, slotNum)); + } + else { + if(temp == slotNum) + bookShelfData.isCurrentBookDataToggled = currentBookData.slotId != -2; + else{ + bookShelfData.isCurrentBookDataToggled = false; + BookshelfInspectorClient.currentBookData = BookData.empty(); + } + } + } + + private void resetBookShelfData(){ + if(!bookShelfData.isCurrentBookDataToggled) return; + + bookShelfData.isCurrentBookDataToggled = false; + currentBookData = BookData.empty(); + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/util/BookshelfTools.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/util/BookshelfTools.java new file mode 100644 index 0000000..6f84817 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/util/BookshelfTools.java @@ -0,0 +1,28 @@ +package com.lukasabbe.bookshelfinspector.util; + +import com.lukasabbe.bookshelfinspector.BookshelfInspector; +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity; + +import java.util.Optional; + +public class BookshelfTools { + public static ItemStack getItemById(BlockPos pos, int slotNum, Player player){ + final Level world = BookshelfInspector.serverInstance.getPlayerList().getPlayer(player.getUUID()).level(); + + final Optional blockEntityOptional = world.getBlockEntity(pos, BlockEntityType.CHISELED_BOOKSHELF); + + if(blockEntityOptional.isEmpty()) return null; + + final ChiseledBookShelfBlockEntity blockEntity = blockEntityOptional.get(); + final ItemStack stack = blockEntity.getItem(slotNum); + + if(stack.isEmpty()) return null; + + return stack; + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/util/LecternTools.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/util/LecternTools.java new file mode 100644 index 0000000..0ef640e --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/util/LecternTools.java @@ -0,0 +1,24 @@ +package com.lukasabbe.bookshelfinspector.util; + +import com.lukasabbe.bookshelfinspector.BookshelfInspector; +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.LecternBlockEntity; + +import java.util.Optional; + +public class LecternTools { + public static ItemStack getItemStack(BlockPos pos, Player player){ + final Level world = BookshelfInspector.serverInstance.getPlayerList().getPlayer(player.getUUID()).level(); + + Optional blockEntityOptional = world.getBlockEntity(pos, BlockEntityType.LECTERN); + if(blockEntityOptional.isEmpty()) return null; + + LecternBlockEntity lecternBlock = blockEntityOptional.get(); + + return lecternBlock.getBook(); + } +} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/util/RomanNumerals.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/util/RomanNumerals.java new file mode 100644 index 0000000..ca11bf2 --- /dev/null +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/util/RomanNumerals.java @@ -0,0 +1,33 @@ +package com.lukasabbe.bookshelfinspector.util; + +import java.util.TreeMap; + +public class RomanNumerals { + private final static TreeMap map = new TreeMap<>(); + static { + map.put(1000, "M"); + map.put(900, "CM"); + map.put(500, "D"); + map.put(400, "CD"); + map.put(100, "C"); + map.put(90, "XC"); + map.put(50, "L"); + map.put(40, "XL"); + map.put(10, "X"); + map.put(9, "IX"); + map.put(5, "V"); + map.put(4, "IV"); + map.put(1, "I"); + } + + + public static String toRoman(int number){ + int key = map.floorKey(number); + + if(number == key){ + return map.get(number); + } + + return map.get(key) + toRoman(number-key); + } +} diff --git a/common/src/main/resources/assets/bookshelfinspector/icon.png b/common/src/main/resources/assets/bookshelfinspector/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..024c09aaed39acd340eaa01cf2535ad37e316f5d GIT binary patch literal 61927 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∾S;Wh$yGx1a0q(4hwZ)O)nFBA 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%0DL!1}?xNB4&Qs8tn@MugL9w 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 E2c0-}-T(jq literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/bookshelfinspector/lang/en_us.json b/common/src/main/resources/assets/bookshelfinspector/lang/en_us.json new file mode 100644 index 0000000..d5e0147 --- /dev/null +++ b/common/src/main/resources/assets/bookshelfinspector/lang/en_us.json @@ -0,0 +1,10 @@ +{ + "bookshelfinspector.config.title": "Bookshelf Inspector Config", + "bookshelfinspector.config.category": "Settings", + "bookshelfinspector.config.lectern.toggle": "Turn OFF or ON lectern support", + "bookshelfinspector.config.lectern.toggle.tooltip": "This will turn OFF/ON the visibility of lectern inspection", + "bookshelfinspector.config.scale": "Change the scale of the text", + "bookshelfinspector.config.scale.tooltip": "Change the scale of the text by dragging the slider", + "bookshelfinspector.config.roman_scale": "Use roman numerals!", + "bookshelfinspector.config.roman_scale.tooltip": "Use roman numerals or arabic numerals" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/bookshelfinspector/lang/sv_se.json b/common/src/main/resources/assets/bookshelfinspector/lang/sv_se.json new file mode 100644 index 0000000..08d65bd --- /dev/null +++ b/common/src/main/resources/assets/bookshelfinspector/lang/sv_se.json @@ -0,0 +1,10 @@ +{ + "bookshelfinspector.config.title": "Bookshelf Inspector Config", + "bookshelfinspector.config.category": "Inställningar", + "bookshelfinspector.config.lectern.toggle": "Stäng AV eller PÅ läspulpet stöd", + "bookshelfinspector.config.lectern.toggle.tooltip": "Denna inställning kommer stänga av eller på synligeten av läspulpet inspektion", + "bookshelfinspector.config.scale": "Ändra storleken på texten", + "bookshelfinspector.config.scale.tooltip": "Du kan göra det igenom att dra på den nedan", + "bookshelfinspector.config.roman_scale": "Använd romerska siffror", + "bookshelfinspector.config.roman_scale.tooltip": "Använd romerska siffror eller arabiska siffror" +} \ No newline at end of file diff --git a/common/src/main/resources/bookshelfinspector-config.yml b/common/src/main/resources/bookshelfinspector-config.yml new file mode 100644 index 0000000..511afdf --- /dev/null +++ b/common/src/main/resources/bookshelfinspector-config.yml @@ -0,0 +1,3 @@ +lectern-toggle: true +scale: 10 +roman: false \ No newline at end of file diff --git a/common/src/main/resources/bookshelfinspector.mixins.json b/common/src/main/resources/bookshelfinspector.mixins.json new file mode 100644 index 0000000..5443468 --- /dev/null +++ b/common/src/main/resources/bookshelfinspector.mixins.json @@ -0,0 +1,19 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.lukasabbe.bookshelfinspector.mixin", + "refmap": "${mod_id}.refmap.json", + "compatibilityLevel": "JAVA_18", + "mixins": [ + ], + "client": [ + "BookshelfMixin", + "InGameHudMixin", + "BookshelfInvoker" + ], + "server": [], + "injectors": { + "defaultRequire": 1 + } +} + diff --git a/common/src/main/resources/data/c/tags/block/chiseled_bookshelves.json b/common/src/main/resources/data/c/tags/block/chiseled_bookshelves.json new file mode 100644 index 0000000..fe20353 --- /dev/null +++ b/common/src/main/resources/data/c/tags/block/chiseled_bookshelves.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:chiseled_bookshelf" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..52854ec --- /dev/null +++ b/common/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "${mod_name}", + "pack_format": 8 + } +} \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..4da0191 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'multiloader-loader' + id 'fabric-loom' +} +repositories { + maven { url "https://maven.shedaniel.me/" } + maven { url "https://maven.terraformersmc.com/releases/" } +} + +dependencies { + minecraft "com.mojang:minecraft:${minecraft_version}" + mappings loom.layered { + officialMojangMappings() + parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip") + } + modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" + + modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config}" + modApi "com.terraformersmc:modmenu:${project.mod_menu}" + include(implementation("org.yaml:snakeyaml:${project.YAML_snake}")) +} + +loom { + def aw = project(':common').file("src/main/resources/${mod_id}.accesswidener") + if (aw.exists()) { + accessWidenerPath.set(aw) + } + mixin { + defaultRefmapName.set("${mod_id}.refmap.json") + } + runs { + client { + client() + setConfigName('Fabric Client') + ideConfigGenerated(true) + runDir('runs/client') + } + server { + server() + setConfigName('Fabric Server') + ideConfigGenerated(true) + runDir('runs/server') + } + } +} \ No newline at end of file diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabric.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabric.java new file mode 100644 index 0000000..5fb9435 --- /dev/null +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabric.java @@ -0,0 +1,33 @@ +package com.lukasabbe.bookshelfinspector; + +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayload; +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload; +import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload; +import com.lukasabbe.bookshelfinspector.network.packets.ModCheckPayload; +import com.lukasabbe.bookshelfinspector.network.server.BookShelfInventoryRequestServerPayloadHandler; +import com.lukasabbe.bookshelfinspector.network.server.LecternInventoryRequestServerPayloadHandler; +import com.lukasabbe.bookshelfinspector.platform.Services; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; + +public class BookshelfInspectorFabric implements ModInitializer { + + @Override + public void onInitialize() { + + PayloadTypeRegistry.playC2S().register(BookShelfInventoryRequestPayload.ID, BookShelfInventoryRequestPayload.CODEC); + PayloadTypeRegistry.playC2S().register(LecternInventoryRequestPayload.ID, LecternInventoryRequestPayload.CODEC); + PayloadTypeRegistry.playS2C().register(BookShelfInventoryPayload.ID, BookShelfInventoryPayload.CODEC); + PayloadTypeRegistry.playS2C().register(ModCheckPayload.ID, ModCheckPayload.CODEC); + + ServerPlayNetworking.registerGlobalReceiver( + BookShelfInventoryRequestPayload.ID, + (payload, context) -> BookshelfInspector.networkHandlers.bookShelfInventoryRequestServerPayloadHandler.receive(payload, context.player())); + ServerPlayNetworking.registerGlobalReceiver( + LecternInventoryRequestPayload.ID, + ((payload, context) -> BookshelfInspector.networkHandlers.lecternInventoryRequestServerPayloadHandler.receive(payload, context.player()))); + + BookshelfInspector.init(); + } +} diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabricClient.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabricClient.java new file mode 100644 index 0000000..77a9e0f --- /dev/null +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorFabricClient.java @@ -0,0 +1,19 @@ +package com.lukasabbe.bookshelfinspector; + +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayload; +import com.lukasabbe.bookshelfinspector.network.packets.ModCheckPayload; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; + +public class BookshelfInspectorFabricClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + ClientPlayNetworking.registerGlobalReceiver( + BookShelfInventoryPayload.ID, + ((payload, context) -> BookshelfInspector.networkHandlers.bookShelfInventoryHandlerServer.receive(payload, context.player()))); + ClientPlayNetworking.registerGlobalReceiver( + ModCheckPayload.ID, + ((payload, context) -> BookshelfInspector.networkHandlers.modServerPayloadHandler.receive(payload, context.player()))); + BookshelfInspectorClient.clientInit(); + } +} diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java new file mode 100644 index 0000000..7238d99 --- /dev/null +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java @@ -0,0 +1,42 @@ +package com.lukasabbe.bookshelfinspector; + +import com.terraformersmc.modmenu.api.ConfigScreenFactory; +import com.terraformersmc.modmenu.api.ModMenuApi; +import me.shedaniel.clothconfig2.api.ConfigBuilder; +import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; +import net.minecraft.network.chat.Component; + +public class ModMenu implements ModMenuApi { + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return parent -> { + ConfigBuilder builder = ConfigBuilder + .create() + .setParentScreen(parent) + .setTitle(Component.translatable("bookshelfinspector.config.title")); + ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + + builder + .getOrCreateCategory(Component.translatable("bookshelfinspector.config.category")) + .addEntry(entryBuilder + .startBooleanToggle(Component.translatable("bookshelfinspector.config.lectern.toggle"), BookshelfInspectorClient.config.lecternToggle) + .setTooltip(Component.translatable("bookshelfinspector.config.lectern.toggle.tooltip")) + .setDefaultValue(true) + .setSaveConsumer(val -> BookshelfInspectorClient.config.lecternToggle = val).build()) + .addEntry(entryBuilder + .startIntSlider(Component.translatable("bookshelfinspector.config.scale"),BookshelfInspectorClient.config.scale,0,20) + .setTooltip(Component.translatable("bookshelfinspector.config.scale.tooltip")) + .setDefaultValue(10).setSaveConsumer(val -> BookshelfInspectorClient.config.scale = val) + .build()) + .addEntry(entryBuilder + .startBooleanToggle(Component.translatable("bookshelfinspector.config.roman_scale"), BookshelfInspectorClient.config.useRoman) + .setTooltip(Component.translatable("bookshelfinspector.config.roman_scale.tooltip")) + .setDefaultValue(false) + .setSaveConsumer(val -> BookshelfInspectorClient.config.useRoman = val) + .build()); + + builder.setSavingRunnable(BookshelfInspectorClient.config::saveConfig); + return builder.build(); + }; + } +} diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricEventHelper.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricEventHelper.java new file mode 100644 index 0000000..e24ba4f --- /dev/null +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricEventHelper.java @@ -0,0 +1,19 @@ +package com.lukasabbe.bookshelfinspector.platform; + +import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerDisconnectEvent; +import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerJoinEvent; +import com.lukasabbe.bookshelfinspector.platform.services.IEventHelper; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; + +public class FabricEventHelper implements IEventHelper { + @Override + public void registerOnPlayerJoinEvent(OnPlayerJoinEvent event) { + ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> event.onPlayerJoin(handler.getPlayer(), server)); + } + + @Override + public void registerOnPlayerDisconnect(OnPlayerDisconnectEvent event) { + ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> event.onDisconnect()); + } +} diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricNetworkHelper.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricNetworkHelper.java new file mode 100644 index 0000000..7ab34ae --- /dev/null +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricNetworkHelper.java @@ -0,0 +1,20 @@ +package com.lukasabbe.bookshelfinspector.platform; + +import com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; + +public class FabricNetworkHelper implements INetworkHelper { + + @Override + public void sendPacketFromServer(ServerPlayer player, CustomPacketPayload payload) { + ServerPlayNetworking.send(player, payload); + } + + @Override + public void sendPacketFromClient(CustomPacketPayload payload) { + ClientPlayNetworking.send(payload); + } +} diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricPlatformHelper.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricPlatformHelper.java new file mode 100644 index 0000000..cda435e --- /dev/null +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricPlatformHelper.java @@ -0,0 +1,39 @@ +package com.lukasabbe.bookshelfinspector.platform; + +import com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper; +import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.ModContainer; + +import java.nio.file.Path; + +public class FabricPlatformHelper implements IPlatformHelper { + + @Override + public String getPlatformName() { + return "Fabric"; + } + + @Override + public boolean isModLoaded(String modId) { + + return FabricLoader.getInstance().isModLoaded(modId); + } + + @Override + public boolean isDevelopmentEnvironment() { + + return FabricLoader.getInstance().isDevelopmentEnvironment(); + } + + @Override + public Path getConfigPath(String file) { + return FabricLoader.getInstance().getConfigDir().resolve(file); + } + + @Override + public Path getFileInModContainer(String mod, String fileName) { + if(FabricLoader.getInstance().getModContainer(mod).isEmpty()) return null; + ModContainer modContainer = FabricLoader.getInstance().getModContainer(mod).get(); + return modContainer.findPath(fileName).orElseThrow(); + } +} diff --git a/fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IEventHelper b/fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IEventHelper new file mode 100644 index 0000000..9989820 --- /dev/null +++ b/fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IEventHelper @@ -0,0 +1 @@ +com.lukasabbe.bookshelfinspector.platform.FabricEventHelper \ No newline at end of file diff --git a/fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper b/fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper new file mode 100644 index 0000000..92ef1e6 --- /dev/null +++ b/fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper @@ -0,0 +1 @@ +com.lukasabbe.bookshelfinspector.platform.FabricNetworkHelper \ No newline at end of file diff --git a/fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper b/fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper new file mode 100644 index 0000000..0328dfc --- /dev/null +++ b/fabric/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper @@ -0,0 +1 @@ +com.lukasabbe.bookshelfinspector.platform.FabricPlatformHelper \ No newline at end of file diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..ed78e4f --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,38 @@ +{ + "schemaVersion": 1, + "id": "${mod_id}", + "version": "${version}", + "name": "${mod_name}", + "description": "${description}", + "authors": [ + "${mod_author}" + ], + "contact": { + "homepage": "https://modrinth.com/mod/bookshelf-inspector", + "sources": "https://github.com/lukasabbe/bookshelf-inspector" + }, + "license": "${license}", + "environment": "*", + "icon": "assets/bookshelfinspector/icon.png", + "entrypoints": { + "main": [ + "com.lukasabbe.bookshelfinspector.BookshelfInspectorFabric" + ], + "client": [ + "com.lukasabbe.bookshelfinspector.BookshelfInspectorFabricClient" + ], + "modmenu": [ + "com.lukasabbe.bookshelfinspector.ModMenu" + ] + }, + "mixins": [ + "bookshelfinspector.mixins.json" + ], + "depends": { + "fabricloader": ">=${fabric_loader_version}", + "fabric-api": "*", + "minecraft": "~${minecraft_version}", + "java": ">=${java_version}" + } +} + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..757f2c4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,44 @@ +# Important Notes: +# Every field you add must be added to buildSrc/src/main/groovy/multiloader-common.gradle expandProps map. + +# Project +version=1.0+1.21.5 +group=com.lukasabbe.bookshelfinspector +java_version=21 + +# Common +minecraft_version=1.21.5 +mod_name=BookshelfInspector +mod_author=Lukasabbe +mod_id=bookshelfinspector +license=MIT +credits= +description=Inspect any book in a chiseled bookshelf. +minecraft_version_range=[1.21.5, 1.22) +## This is the version of minecraft that the 'common' project uses, you can find a list of all versions here +## https://projects.neoforged.net/neoforged/neoform +neo_form_version=1.21.5-20250325.162830 +# The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions +parchment_minecraft=1.21.4 +parchment_version=2025.03.23 + +# Fabric +fabric_version=0.119.5+1.21.5 +fabric_loader_version=0.16.10 + +# Forge +forge_version=55.0.1 +forge_loader_version_range=[55,) + +# NeoForge +neoforge_version=21.5.4-beta +neoforge_loader_version_range=[4,) + +# Gradle +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false + +# Global dep +YAML_snake=2.4 +cloth_config=18.0.145 +mod_menu=14.0.0-rc.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..cea7a79 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f3b75f3 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/neoforge/build.gradle b/neoforge/build.gradle new file mode 100644 index 0000000..4f70067 --- /dev/null +++ b/neoforge/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'multiloader-loader' + id 'net.neoforged.moddev' +} +repositories { + maven { url "https://maven.shedaniel.me/" } + mavenCentral() +} +neoForge { + version = neoforge_version + // Automatically enable neoforge AccessTransformers if the file exists + def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg') + if (at.exists()) { + accessTransformers.from(at.absolutePath) + } + parchment { + minecraftVersion = parchment_minecraft + mappingsVersion = parchment_version + } + dependencies { + api "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config}" + } + + runs { + configureEach { + systemProperty('neoforge.enabledGameTestNamespaces', mod_id) + ideName = "NeoForge ${it.name.capitalize()} (${project.path})" // Unify the run config names with fabric + } + client { + client() + } + data { + clientData() + } + server { + server() + } + } + mods { + "${mod_id}" { + sourceSet sourceSets.main + } + } +} + +sourceSets.main.resources { srcDir 'src/generated/resources' } \ No newline at end of file diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForge.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForge.java new file mode 100644 index 0000000..e0b2a46 --- /dev/null +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForge.java @@ -0,0 +1,18 @@ +package com.lukasabbe.bookshelfinspector; + +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModList; +import net.neoforged.fml.ModLoadingContext; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.client.gui.IConfigScreenFactory; + +@Mod(Constants.MOD_ID) +public class BookshelfInspectorNeoForge { + + public BookshelfInspectorNeoForge(IEventBus eventBus) { + EventHandler.init(); + eventBus.addListener(NetworkHandler::registerPayloads); + BookshelfInspector.init(); + ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> (client, parent) -> ClothConfigGenerator.createConfig(parent)); + } +} \ No newline at end of file diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForgeClient.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForgeClient.java new file mode 100644 index 0000000..ea6e77a --- /dev/null +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForgeClient.java @@ -0,0 +1,12 @@ +package com.lukasabbe.bookshelfinspector; + +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; + +@Mod(value = Constants.MOD_ID, dist = Dist.CLIENT) +public class BookshelfInspectorNeoForgeClient { + public BookshelfInspectorNeoForgeClient(IEventBus bus) { + BookshelfInspectorClient.clientInit(); + } +} diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/ClothConfigGenerator.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/ClothConfigGenerator.java new file mode 100644 index 0000000..0ca2df2 --- /dev/null +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/ClothConfigGenerator.java @@ -0,0 +1,38 @@ +package com.lukasabbe.bookshelfinspector; + +import me.shedaniel.clothconfig2.api.ConfigBuilder; +import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; + +public class ClothConfigGenerator { + public static Screen createConfig(Screen parent){ + ConfigBuilder builder = ConfigBuilder + .create() + .setParentScreen(parent) + .setTitle(Component.translatable("bookshelfinspector.config.title")); + ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + + builder + .getOrCreateCategory(Component.translatable("bookshelfinspector.config.category")) + .addEntry(entryBuilder + .startBooleanToggle(Component.translatable("bookshelfinspector.config.lectern.toggle"), BookshelfInspectorClient.config.lecternToggle) + .setTooltip(Component.translatable("bookshelfinspector.config.lectern.toggle.tooltip")) + .setDefaultValue(true) + .setSaveConsumer(val -> BookshelfInspectorClient.config.lecternToggle = val).build()) + .addEntry(entryBuilder + .startIntSlider(Component.translatable("bookshelfinspector.config.scale"),BookshelfInspectorClient.config.scale,0,20) + .setTooltip(Component.translatable("bookshelfinspector.config.scale.tooltip")) + .setDefaultValue(10).setSaveConsumer(val -> BookshelfInspectorClient.config.scale = val) + .build()) + .addEntry(entryBuilder + .startBooleanToggle(Component.translatable("bookshelfinspector.config.roman_scale"), BookshelfInspectorClient.config.useRoman) + .setTooltip(Component.translatable("bookshelfinspector.config.roman_scale.tooltip")) + .setDefaultValue(false) + .setSaveConsumer(val -> BookshelfInspectorClient.config.useRoman = val) + .build()); + + builder.setSavingRunnable(BookshelfInspectorClient.config::saveConfig); + return builder.build(); + } +} diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/EventHandler.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/EventHandler.java new file mode 100644 index 0000000..5ab082d --- /dev/null +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/EventHandler.java @@ -0,0 +1,30 @@ +package com.lukasabbe.bookshelfinspector; + +import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerDisconnectEvent; +import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerJoinEvent; +import net.minecraft.server.level.ServerPlayer; +import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.event.entity.player.PlayerEvent; + +import java.util.ArrayList; +import java.util.List; + +public class EventHandler { + public static List playerJoinEvents = new ArrayList<>(); + public static List playerDisconnectEvents = new ArrayList<>(); + + public static void init(){ + NeoForge.EVENT_BUS.addListener(EventHandler::onJoin); + NeoForge.EVENT_BUS.addListener(EventHandler::onDisconnect); + } + + private static void onJoin(PlayerEvent.PlayerLoggedInEvent event){ + playerJoinEvents.forEach(onPlayerJoinEvent -> onPlayerJoinEvent.onPlayerJoin((ServerPlayer) event.getEntity(),event.getEntity().getServer())); + } + + private static void onDisconnect(ClientPlayerNetworkEvent.LoggingOut event){ + playerDisconnectEvents.forEach(OnPlayerDisconnectEvent::onDisconnect); + } + +} diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java new file mode 100644 index 0000000..5ce3c13 --- /dev/null +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java @@ -0,0 +1,40 @@ +package com.lukasabbe.bookshelfinspector; + +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayload; +import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload; +import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload; +import com.lukasabbe.bookshelfinspector.network.packets.ModCheckPayload; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.server.level.ServerPlayer; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; +import net.neoforged.neoforge.network.registration.PayloadRegistrar; + +public class NetworkHandler { + + @SubscribeEvent + public static void registerPayloads(final RegisterPayloadHandlersEvent event){ + final PayloadRegistrar registrar = event.registrar("1"); + registrar.playToServer( + BookShelfInventoryRequestPayload.ID, + BookShelfInventoryRequestPayload.CODEC, + ((payload, context) -> BookshelfInspector.networkHandlers.bookShelfInventoryRequestServerPayloadHandler.receive(payload, (ServerPlayer) context.player())) + ); + registrar.playToServer( + LecternInventoryRequestPayload.ID, + LecternInventoryRequestPayload.CODEC, + ((payload, context) -> BookshelfInspector.networkHandlers.lecternInventoryRequestServerPayloadHandler.receive(payload, (ServerPlayer) context.player())) + ); + registrar.playToClient( + BookShelfInventoryPayload.ID, + BookShelfInventoryPayload.CODEC, + ((payload, context) -> BookshelfInspector.networkHandlers.bookShelfInventoryHandlerServer.receive(payload, (LocalPlayer) context.player())) + ); + registrar.playToClient( + ModCheckPayload.ID, + ModCheckPayload.CODEC, + ((payload, context) -> BookshelfInspector.networkHandlers.modServerPayloadHandler.receive(payload, (LocalPlayer) context.player())) + ); + } + +} diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeEventHelper.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeEventHelper.java new file mode 100644 index 0000000..3bd0cc9 --- /dev/null +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeEventHelper.java @@ -0,0 +1,18 @@ +package com.lukasabbe.bookshelfinspector.platform; + +import com.lukasabbe.bookshelfinspector.EventHandler; +import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerDisconnectEvent; +import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerJoinEvent; +import com.lukasabbe.bookshelfinspector.platform.services.IEventHelper; + +public class NeoForgeEventHelper implements IEventHelper { + @Override + public void registerOnPlayerJoinEvent(OnPlayerJoinEvent event) { + EventHandler.playerJoinEvents.add(event); + } + + @Override + public void registerOnPlayerDisconnect(OnPlayerDisconnectEvent event) { + EventHandler.playerDisconnectEvents.add(event); + } +} diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeNetworkHelper.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeNetworkHelper.java new file mode 100644 index 0000000..861517c --- /dev/null +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeNetworkHelper.java @@ -0,0 +1,18 @@ +package com.lukasabbe.bookshelfinspector.platform; + +import com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; +import net.neoforged.neoforge.network.PacketDistributor; + +public class NeoForgeNetworkHelper implements INetworkHelper { + @Override + public void sendPacketFromServer(ServerPlayer player, CustomPacketPayload payload) { + PacketDistributor.sendToPlayer(player, payload); + } + + @Override + public void sendPacketFromClient(CustomPacketPayload payload) { + PacketDistributor.sendToServer(payload); + } +} diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgePlatformHelper.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgePlatformHelper.java new file mode 100644 index 0000000..8d0883f --- /dev/null +++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgePlatformHelper.java @@ -0,0 +1,43 @@ +package com.lukasabbe.bookshelfinspector.platform; + +import com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.ModList; +import net.neoforged.fml.config.ModConfig; +import net.neoforged.fml.loading.FMLLoader; +import net.neoforged.fml.loading.FMLPaths; + +import java.nio.file.Path; + +public class NeoForgePlatformHelper implements IPlatformHelper { + + @Override + public String getPlatformName() { + + return "NeoForge"; + } + + @Override + public boolean isModLoaded(String modId) { + + return ModList.get().isLoaded(modId); + } + + @Override + public boolean isDevelopmentEnvironment() { + + return !FMLLoader.isProduction(); + } + + @Override + public Path getConfigPath(String file) { + return FMLPaths.CONFIGDIR.get().resolve(file); + } + + @Override + public Path getFileInModContainer(String mod, String fileName) { + if(ModList.get().getModContainerById(mod).isEmpty()) return null; + ModContainer container = ModList.get().getModContainerById(mod).get(); + return container.getModInfo().getOwningFile().getFile().findResource(fileName); + } +} \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..6145960 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,34 @@ +modLoader = "javafml" #mandatory +loaderVersion = "${neoforge_loader_version_range}" #mandatory +license = "${license}" # Review your options at https://choosealicense.com/. +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional +[[mods]] #mandatory +modId = "${mod_id}" #mandatory +version = "${version}" #mandatory +displayName = "${mod_name}" #mandatory +#updateJSONURL="https://change.me.example.invalid/updates.json" #optional (see https://docs.neoforged.net/docs/misc/updatechecker/) +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional (displayed in the mod UI) +logoFile="${mod_id}.png" #optional +credits="${credits}" #optional +authors = "${mod_author}" #optional +description = '''${description}''' #mandatory (Supports multiline text) +[[mixins]] +config = "${mod_id}.mixins.json" +[[dependencies.${mod_id}]] #optional +modId = "neoforge" #mandatory +type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") +versionRange = "[${neoforge_version},)" #mandatory +ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory +side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER' +[[dependencies.${mod_id}]] +modId = "minecraft" +type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") +versionRange = "${minecraft_version_range}" +ordering = "NONE" +side = "BOTH" + +# Features are specific properties of the game environment, that you may want to declare you require. This example declares +# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't +# stop your mod loading on the server for example. +#[features.${mod_id}] +#openGLVersion="[3.2,)" diff --git a/neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IEventHelper b/neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IEventHelper new file mode 100644 index 0000000..7f2651a --- /dev/null +++ b/neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IEventHelper @@ -0,0 +1 @@ +com.lukasabbe.bookshelfinspector.platform.NeoForgeEventHelper \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper b/neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper new file mode 100644 index 0000000..ca5a2e8 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.INetworkHelper @@ -0,0 +1 @@ +com.lukasabbe.bookshelfinspector.platform.NeoForgeNetworkHelper \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper b/neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper new file mode 100644 index 0000000..de7b494 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/services/com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper @@ -0,0 +1 @@ +com.lukasabbe.bookshelfinspector.platform.NeoForgePlatformHelper \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..0236d8e --- /dev/null +++ b/settings.gradle @@ -0,0 +1,51 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + + exclusiveContent { + forRepository { + maven { + name = 'Fabric' + url = uri('https://maven.fabricmc.net') + } + } + filter { + includeGroup('net.fabricmc') + includeGroup('fabric-loom') + } + } + exclusiveContent { + forRepository { + maven { + name = 'Sponge' + url = uri('https://repo.spongepowered.org/repository/maven-public') + } + } + filter { + includeGroupAndSubgroups("org.spongepowered") + } + } + exclusiveContent { + forRepository { + maven { + name = 'Forge' + url = uri('https://maven.minecraftforge.net') + } + } + filter { + includeGroupAndSubgroups('net.minecraftforge') + } + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} + +// This should match the folder name of the project, or else IDEA may complain (see https://youtrack.jetbrains.com/issue/IDEA-317606) +rootProject.name = 'BookshelfInspectorMultiloader' +include('common') +include('fabric') +include('neoforge')