commit b229b1ed2f02ab39e9d215216be729f38989774e Author: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Fri Sep 20 22:53:21 2024 +0200 Init diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..13e1783 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,45 @@ +name: build +on: [push] + +jobs: + build: + strategy: + matrix: + # Use these Java versions + java: [ + 21, # Current Java LTS + ] + runs-on: ubuntu-22.04 + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v2 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ + - name: Read values from Prop. file + id: read_property + uses: christian-draeger/read-properties@1.1.1 + with: + path: "./gradle.properties" + properties: "mod_version minecraft_version archives_base_name" + + - name: Upload artifacts to discord + uses: tsickert/discord-webhook@v6.0.0 + with: + webhook-url: ${{ secrets.WEBHOOK_URL }} + content: "Git hub action build. **THIS MAY NOT BE A FUNCTIONAL BUILD**\nMod: ${{steps.read_property.outputs.archives_base_name}}\nMCVersion: ${{steps.read_property.outputs.minecraft_version}}\nMod version: ${{steps.read_property.outputs.mod_version}}" + filename: build/libs/${{ steps.read_property.outputs.archives_base_name }}-${{steps.read_property.outputs.mod_version}}.jar \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c37caf --- /dev/null +++ b/.gitignore @@ -0,0 +1,118 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..c986429 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2024 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..030d9cf --- /dev/null +++ b/README.md @@ -0,0 +1,36 @@ +# Chiseled bookshelf inspector + +Inspect any book in a chiseled bookshelf. +If you look at a book in a bookshelf with this mod, you will see what type of book it is and its name! + +### Examples: + +Enchanted books: +![Example 1, with enchanted books](./images/2024-09-20_22.37.28.png) + +Written book: +![Example 2, with Written book](./images/2024-09-20_22.38.09.png) + +Normal book: +![Example 3. with a normal book](./images/2024-09-20_22.38.19.png) + +# Multiplayer + +This mod will need to be on the server to work in multiplayer. +You don't need the mod to connect to the server. It's totally optional! + +# Looking for a server? +Get BisectHosting and save 25% off for new customers using code Lukas at checkout. +Thanks for your support — it helps me develop this and other mods I make! +#ad +[![Support me](https://www.bisecthosting.com/partners/custom-banners/ca44e941-2306-414c-8c65-7c50bc6fcf48.webp)](https://bisecthosting.com/Lukas) + +# Open source +Nearly all my mods are opensource and under MIT. +Feel free to use however you want. +If you want to help the development, check out the [GitHub](https://github.com/lukasabbe/bookshelf-inspector)! + +# Inspiration and credit +- The mod is inspired by [gm4-bookshelf-inspector](https://modrinth.com/datapack/gm4-bookshelf-inspector) +- Lukasabbe has coded +- Wikiraze requested it \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..1e1f771 --- /dev/null +++ b/build.gradle @@ -0,0 +1,91 @@ +plugins { + id 'fabric-loom' version '1.7-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + + +repositories {} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + Set apiMudules = [ + "fabric-api-base", + "fabric-networking-api-v1", + "fabric-lifecycle-events-v1" + ] + + apiMudules.forEach { + include(modImplementation(fabricApi.module(it,project.fabric_version))) + } +} + +processResources { + inputs.property "version", project.version + inputs.property "minecraft_version", project.minecraft_version + inputs.property "loader_version", project.loader_version + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version, + "minecraft_version": project.minecraft_version, + "loader_version": project.loader_version + } +} + +def targetJavaVersion = 21 +tasks.withType(JavaCompile).configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + it.options.release.set(targetJavaVersion) + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}" } + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..43344b6 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,14 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +# Fabric Properties +# check these on https://modmuss50.me/fabric.html +minecraft_version=1.21 +yarn_mappings=1.21+build.9 +loader_version=0.16.5 +# Mod Properties +mod_version=1.0+1.21 +maven_group=me.lukasabbe +archives_base_name=Bookshelfinspector + +fabric_version=0.104.0+1.21.1 + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a441313 --- /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.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..b740cf1 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + 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..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 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/images/2024-09-20_22.37.28.png b/images/2024-09-20_22.37.28.png new file mode 100644 index 0000000..66092e8 Binary files /dev/null and b/images/2024-09-20_22.37.28.png differ diff --git a/images/2024-09-20_22.38.09.png b/images/2024-09-20_22.38.09.png new file mode 100644 index 0000000..e73b6ea Binary files /dev/null and b/images/2024-09-20_22.38.09.png differ diff --git a/images/2024-09-20_22.38.19.png b/images/2024-09-20_22.38.19.png new file mode 100644 index 0000000..c5bdf9e Binary files /dev/null and b/images/2024-09-20_22.38.19.png differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f91a4fe --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/Bookshelfinspector.java b/src/main/java/me/lukasabbe/bookshelfinspector/Bookshelfinspector.java new file mode 100644 index 0000000..0058d58 --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/Bookshelfinspector.java @@ -0,0 +1,46 @@ +package me.lukasabbe.bookshelfinspector; + +import me.lukasabbe.bookshelfinspector.network.BookShelfInventoryPayload; +import me.lukasabbe.bookshelfinspector.network.BookShelfInventoryRequestPayload; +import me.lukasabbe.bookshelfinspector.network.ModCheckPayload; +import me.lukasabbe.bookshelfinspector.util.BookshelfTools; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.server.MinecraftServer; + +import java.util.logging.Logger; + +public class Bookshelfinspector implements ModInitializer { + public static MinecraftServer serverInstance; + public final static String MOD_ID = "bookshelfinspector"; + + public static Logger LOGGER = Logger.getLogger(MOD_ID); + + @Override + public void onInitialize() { + PayloadTypeRegistry.playC2S().register(BookShelfInventoryRequestPayload.ID,BookShelfInventoryRequestPayload.CODEC); + PayloadTypeRegistry.playS2C().register(BookShelfInventoryPayload.ID,BookShelfInventoryPayload.CODEC); + PayloadTypeRegistry.playS2C().register(ModCheckPayload.ID, ModCheckPayload.CODEC); + + + ServerPlayNetworking.registerGlobalReceiver(BookShelfInventoryRequestPayload.ID,((payload, context) -> context.server().execute(() -> { + if(Bookshelfinspector.serverInstance == null) return; + + ItemStack stack = BookshelfTools.getItemById(payload.pos(),payload.slotNum(),context.player()); + if(stack == null){ + ServerPlayNetworking.send(context.player(), new BookShelfInventoryPayload(Items.AIR.getDefaultStack(), payload.pos(), payload.slotNum())); + return; + } + ServerPlayNetworking.send(context.player(), new BookShelfInventoryPayload(stack, payload.pos(), payload.slotNum())); + }))); + + ServerPlayConnectionEvents.JOIN.register(((handler, sender, server) -> { + serverInstance = server; + ServerPlayNetworking.send(handler.player, new ModCheckPayload(true)); + })); + } +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/BookshelfinspectorClient.java b/src/main/java/me/lukasabbe/bookshelfinspector/BookshelfinspectorClient.java new file mode 100644 index 0000000..16cce02 --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/BookshelfinspectorClient.java @@ -0,0 +1,41 @@ +package me.lukasabbe.bookshelfinspector; + +import me.lukasabbe.bookshelfinspector.data.BookData; +import me.lukasabbe.bookshelfinspector.network.BookShelfInventoryPayload; +import me.lukasabbe.bookshelfinspector.network.ModCheckPayload; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.hit.HitResult; + +@Environment(EnvType.CLIENT) +public class BookshelfinspectorClient implements ClientModInitializer { + + public static BookData currentBookData = new BookData(ItemStack.EMPTY, null, -1); + public static boolean isCurrentBookDataToggled = false; + public static boolean modAvailable = false; + public static HitResult latestHit; + + @Override + public void onInitializeClient() { + ClientPlayNetworking.registerGlobalReceiver(BookShelfInventoryPayload.ID, + ((payload, context) -> + context.client().execute(() ->{ + if(payload.itemStack().isOf(Items.AIR)) + isCurrentBookDataToggled = false; + else{ + BookshelfinspectorClient.isCurrentBookDataToggled = true; + currentBookData = new BookData(payload.itemStack(),payload.pos(),payload.slotNum()); + } + }))); + + ClientPlayNetworking.registerGlobalReceiver(ModCheckPayload.ID, + (payload, context) -> context.client().execute(() ->{ + Bookshelfinspector.LOGGER.info("Connected to server"); + modAvailable = true; + })); + } +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/data/BookData.java b/src/main/java/me/lukasabbe/bookshelfinspector/data/BookData.java new file mode 100644 index 0000000..eaa8409 --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/data/BookData.java @@ -0,0 +1,16 @@ +package me.lukasabbe.bookshelfinspector.data; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; + +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; + } +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java b/src/main/java/me/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java new file mode 100644 index 0000000..5a82b55 --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java @@ -0,0 +1,15 @@ +package me.lukasabbe.bookshelfinspector.mixin; + +import net.minecraft.block.BlockState; +import net.minecraft.block.ChiseledBookshelfBlock; +import net.minecraft.util.hit.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("getSlotForHitPos") + OptionalInt invokerGetSlotForHitPos(BlockHitResult hit, BlockState state); +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java b/src/main/java/me/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java new file mode 100644 index 0000000..aeb33d2 --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java @@ -0,0 +1,73 @@ +package me.lukasabbe.bookshelfinspector.mixin; + +import me.lukasabbe.bookshelfinspector.BookshelfinspectorClient; +import me.lukasabbe.bookshelfinspector.data.BookData; +import me.lukasabbe.bookshelfinspector.network.BookShelfInventoryRequestPayload; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.minecraft.block.BlockState; +import net.minecraft.block.ChiseledBookshelfBlock; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.block.entity.ChiseledBookshelfBlockEntity; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; +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; + +import java.util.Optional; +import java.util.OptionalInt; + +@Mixin(ClientPlayerEntity.class) +public class BookshelfMixin{ + + @Shadow @Final protected MinecraftClient client; + + @Inject(method = "tick", at= @At(value = "INVOKE", target = "Ljava/util/List;iterator()Ljava/util/Iterator;")) + public void injectTick(CallbackInfo ci){ + bookShelfInspect(); + } + + @Unique + public void bookShelfInspect(){ + if(!BookshelfinspectorClient.modAvailable) return; + + if(client.cameraEntity == null || client.player == null) return; + + HitResult hit = client.cameraEntity.raycast(20f,0f,false); + final HitResult.Type type = hit.getType(); + if(type != HitResult.Type.BLOCK) return; + final BlockHitResult blockHitResult = (BlockHitResult) hit; + BlockPos pos = blockHitResult.getBlockPos(); + + Optional optionalChiseledBookshelfBlockEntity = client.player.getWorld().getBlockEntity(pos, BlockEntityType.CHISELED_BOOKSHELF); + if(optionalChiseledBookshelfBlockEntity.isEmpty()){ + BookshelfinspectorClient.isCurrentBookDataToggled = false; + return; + } + + final BlockState blockState = client.player.getWorld().getBlockState(pos); + + ChiseledBookshelfBlock bookshelfBlock = (ChiseledBookshelfBlock) blockState.getBlock(); + + OptionalInt optionalInt = ((BookshelfInvoker)bookshelfBlock).invokerGetSlotForHitPos(blockHitResult,blockState); + if(optionalInt.isEmpty()) { + BookshelfinspectorClient.isCurrentBookDataToggled = false; + return; + } + + BookshelfinspectorClient.latestHit = hit; + + final BookData currentBookData = BookshelfinspectorClient.currentBookData; + if(currentBookData.itemStack == ItemStack.EMPTY || currentBookData.slotId!=optionalInt.getAsInt() || currentBookData.pos != pos){ + ClientPlayNetworking.send(new BookShelfInventoryRequestPayload(pos, optionalInt.getAsInt())); + } + } +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java b/src/main/java/me/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java new file mode 100644 index 0000000..4762266 --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java @@ -0,0 +1,63 @@ +package me.lukasabbe.bookshelfinspector.mixin; + +import me.lukasabbe.bookshelfinspector.Bookshelfinspector; +import me.lukasabbe.bookshelfinspector.BookshelfinspectorClient; +import me.lukasabbe.bookshelfinspector.data.BookData; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.client.render.RenderTickCounter; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.text.Text; +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(InGameHud.class) + +public class InGameHudMixin { + @Shadow @Final private MinecraftClient client; + + @Inject(method = "render",at=@At("RETURN")) + public void render(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci){ + if(!BookshelfinspectorClient.modAvailable) return; + + if(client.options.hudHidden) return; + + if(BookshelfinspectorClient.isCurrentBookDataToggled){ + final BookData currentBookData = BookshelfinspectorClient.currentBookData; + int screenWidth = client.getWindow().getScaledWidth(); + int screenHeight = client.getWindow().getScaledHeight(); + int x = screenWidth / 2; + int y = screenHeight / 2; + final ItemStack itemStack = currentBookData.itemStack; + int color = 0xFFFFFFFF; + if(itemStack.getRarity().getFormatting().getColorValue() != null){ + color = itemStack.getRarity().getFormatting().getColorValue(); + } + context.drawCenteredTextWithShadow(client.textRenderer, itemStack.getName(), x,y+10, color); + + var storedComponets = itemStack.getComponents().get(DataComponentTypes.STORED_ENCHANTMENTS); + if(storedComponets != null){ + int i = 20; + for(RegistryEntry enchantment : storedComponets.getEnchantments()){ + context.drawCenteredTextWithShadow(client.textRenderer, enchantment.value().description(), x,y+i, 0xFFFFFFFF); + i+=10; + } + } + + var writtenBookContentComponent = itemStack.getComponents().get(DataComponentTypes.WRITTEN_BOOK_CONTENT); + + if(writtenBookContentComponent != null){ + context.drawCenteredTextWithShadow(client.textRenderer, Text.translatableWithFallback("bookshelfinspector.text.book","By ").append(writtenBookContentComponent.author()), x,y+20, 0xFFFFFFFF); + } + + } + } +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/network/BookShelfInspectorNetworkConstants.java b/src/main/java/me/lukasabbe/bookshelfinspector/network/BookShelfInspectorNetworkConstants.java new file mode 100644 index 0000000..ba82dfe --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/network/BookShelfInspectorNetworkConstants.java @@ -0,0 +1,10 @@ +package me.lukasabbe.bookshelfinspector.network; + +import me.lukasabbe.bookshelfinspector.Bookshelfinspector; +import net.minecraft.util.Identifier; + +public class BookShelfInspectorNetworkConstants { + public static final Identifier BOOK_SHELF_INVENTORY_REQUEST_PACKET_ID = Identifier.of(Bookshelfinspector.MOD_ID,"book_shelf_inventory_request"); + public static final Identifier BOOK_SHELF_INVENTORY_PACKET_ID = Identifier.of(Bookshelfinspector.MOD_ID,"book_shelf_inventory"); + public static final Identifier MOD_CHECK_PACKET_ID = Identifier.of(Bookshelfinspector.MOD_ID,"mod_check"); +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/network/BookShelfInventoryPayload.java b/src/main/java/me/lukasabbe/bookshelfinspector/network/BookShelfInventoryPayload.java new file mode 100644 index 0000000..7ed9360 --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/network/BookShelfInventoryPayload.java @@ -0,0 +1,22 @@ +package me.lukasabbe.bookshelfinspector.network; + +import net.minecraft.item.ItemStack; +import net.minecraft.network.RegistryByteBuf; +import net.minecraft.network.codec.PacketCodec; +import net.minecraft.network.codec.PacketCodecs; +import net.minecraft.network.packet.CustomPayload; +import net.minecraft.util.math.BlockPos; + +public record BookShelfInventoryPayload(ItemStack itemStack, BlockPos pos, int slotNum) implements CustomPayload{ + public static final CustomPayload.Id ID = new CustomPayload.Id<>(BookShelfInspectorNetworkConstants.BOOK_SHELF_INVENTORY_PACKET_ID); + public static final PacketCodec CODEC = PacketCodec.tuple( + ItemStack.OPTIONAL_PACKET_CODEC, BookShelfInventoryPayload::itemStack, + BlockPos.PACKET_CODEC, BookShelfInventoryPayload::pos, + PacketCodecs.INTEGER, BookShelfInventoryPayload::slotNum, + BookShelfInventoryPayload::new); + + @Override + public CustomPayload.Id getId() { + return ID; + } +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/network/BookShelfInventoryRequestPayload.java b/src/main/java/me/lukasabbe/bookshelfinspector/network/BookShelfInventoryRequestPayload.java new file mode 100644 index 0000000..34155fd --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/network/BookShelfInventoryRequestPayload.java @@ -0,0 +1,22 @@ +package me.lukasabbe.bookshelfinspector.network; + +import net.minecraft.network.RegistryByteBuf; +import net.minecraft.network.codec.PacketCodec; +import net.minecraft.network.codec.PacketCodecs; +import net.minecraft.network.packet.CustomPayload; +import net.minecraft.util.math.BlockPos; + +public record BookShelfInventoryRequestPayload(BlockPos pos, int slotNum) implements CustomPayload { + + public static final CustomPayload.Id ID = new CustomPayload.Id<>(BookShelfInspectorNetworkConstants.BOOK_SHELF_INVENTORY_REQUEST_PACKET_ID); + + public static final PacketCodec CODEC = PacketCodec.tuple( + BlockPos.PACKET_CODEC,BookShelfInventoryRequestPayload::pos, + PacketCodecs.INTEGER, BookShelfInventoryRequestPayload::slotNum, + BookShelfInventoryRequestPayload::new); + + @Override + public Id getId() { + return ID; + } +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/network/ModCheckPayload.java b/src/main/java/me/lukasabbe/bookshelfinspector/network/ModCheckPayload.java new file mode 100644 index 0000000..dcdcb38 --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/network/ModCheckPayload.java @@ -0,0 +1,21 @@ +package me.lukasabbe.bookshelfinspector.network; + +import net.minecraft.network.RegistryByteBuf; +import net.minecraft.network.codec.PacketCodec; +import net.minecraft.network.codec.PacketCodecs; +import net.minecraft.network.packet.CustomPayload; + +public record ModCheckPayload(boolean modActivated) implements CustomPayload { + + public static final CustomPayload.Id ID = new CustomPayload.Id<>(BookShelfInspectorNetworkConstants.MOD_CHECK_PACKET_ID); + + public static final PacketCodec CODEC = PacketCodec.tuple( + PacketCodecs.BOOL, ModCheckPayload::modActivated, + ModCheckPayload::new + ); + + @Override + public Id getId() { + return ID; + } +} diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/util/BookshelfTools.java b/src/main/java/me/lukasabbe/bookshelfinspector/util/BookshelfTools.java new file mode 100644 index 0000000..7a1e091 --- /dev/null +++ b/src/main/java/me/lukasabbe/bookshelfinspector/util/BookshelfTools.java @@ -0,0 +1,28 @@ +package me.lukasabbe.bookshelfinspector.util; + +import me.lukasabbe.bookshelfinspector.Bookshelfinspector; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.block.entity.ChiseledBookshelfBlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.Optional; + +public class BookshelfTools { + public static ItemStack getItemById(BlockPos pos, int slotNum, PlayerEntity player){ + final World world = Bookshelfinspector.serverInstance.getPlayerManager().getPlayer(player.getUuid()).getWorld(); + + if(world == null) return null; + Optional blockEntityOptional = world.getBlockEntity(pos,BlockEntityType.CHISELED_BOOKSHELF); + if(blockEntityOptional.isEmpty()) return null; + + ChiseledBookshelfBlockEntity blockEntity = blockEntityOptional.get(); + + final ItemStack stack = blockEntity.getStack(slotNum); + if(stack.isEmpty()) return null; + + return stack; + } +} diff --git a/src/main/resources/assets/bookshelfinspector/icon.png b/src/main/resources/assets/bookshelfinspector/icon.png new file mode 100644 index 0000000..024c09a Binary files /dev/null and b/src/main/resources/assets/bookshelfinspector/icon.png differ diff --git a/src/main/resources/assets/bookshelfinspector/lang/en_us.json b/src/main/resources/assets/bookshelfinspector/lang/en_us.json new file mode 100644 index 0000000..7e1e6fd --- /dev/null +++ b/src/main/resources/assets/bookshelfinspector/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "bookshelfinspector.text.book" : "By " +} \ No newline at end of file diff --git a/src/main/resources/assets/bookshelfinspector/lang/sv_se.json b/src/main/resources/assets/bookshelfinspector/lang/sv_se.json new file mode 100644 index 0000000..ad2146f --- /dev/null +++ b/src/main/resources/assets/bookshelfinspector/lang/sv_se.json @@ -0,0 +1,3 @@ +{ + "bookshelfinspector.text.book" : "Av " +} \ No newline at end of file diff --git a/src/main/resources/bookshelfinspector.mixins.json b/src/main/resources/bookshelfinspector.mixins.json new file mode 100644 index 0000000..fa26010 --- /dev/null +++ b/src/main/resources/bookshelfinspector.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "me.lukasabbe.bookshelfinspector.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + ], + "client": [ + "InGameHudMixin", + "BookshelfInvoker", + "BookshelfMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..ba371ed --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,30 @@ +{ + "schemaVersion": 1, + "id": "bookshelfinspector", + "version": "${version}", + "name": "Bookshelfinspector", + "description": "Inspect any book in a chiseled bookshelf.", + "authors": ["Lukasabbe"], + "contact": {}, + "license": "MIT", + "icon": "assets/bookshelfinspector/icon.png", + "environment": "*", + "entrypoints": { + "client": [ + "me.lukasabbe.bookshelfinspector.BookshelfinspectorClient" + ], + "main": [ + "me.lukasabbe.bookshelfinspector.Bookshelfinspector" + ] + }, + "mixins": [ + "bookshelfinspector.mixins.json" + ], + "depends": { + "fabricloader": ">=${loader_version}", + "minecraft": ">=${minecraft_version}", + "fabric-api-base": "*", + "fabric-networking-api-v1": "*", + "fabric-lifecycle-events-v1": "*" + } +}