diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fd3ea03 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/.idea +/.gradle +/build +/run \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..da1d728 --- /dev/null +++ b/build.gradle @@ -0,0 +1,89 @@ +plugins { + id 'fabric-loom' version '1.11-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + modImplementation "net.fabricmc.fabric-api:fabric-api:${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..934d874 --- /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.8 +yarn_mappings=1.21.8+build.1 +loader_version=0.17.2 +# Mod Properties +mod_version=1.0 +maven_group=com.kasetoatz +archives_base_name=JukeboxBoat +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.132.0+1.21.8 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 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..002b867 --- /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.14.1-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..23d15a9 --- /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="\\\"\\\"" + + +# 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, 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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..db3a6ac --- /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= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/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/com/kasetoatz/jukeboxboat/interfaces/IAbstractBoatEntity.java b/src/main/java/com/kasetoatz/jukeboxboat/interfaces/IAbstractBoatEntity.java new file mode 100644 index 0000000..8b632a1 --- /dev/null +++ b/src/main/java/com/kasetoatz/jukeboxboat/interfaces/IAbstractBoatEntity.java @@ -0,0 +1,13 @@ +package com.kasetoatz.jukeboxboat.interfaces; + +import net.minecraft.entity.decoration.DisplayEntity; +import net.minecraft.item.ItemStack; + +public interface IAbstractBoatEntity +{ + boolean jukeboxBoat$isJukeboxBoat(); + void jukeboxBoat$setJukeboxBoat(boolean value); + ItemStack jukeboxBoat$getStoredDisc(); + DisplayEntity.BlockDisplayEntity jukeboxBoat$getJukebox(); + void jukeboxBoat$setJukebox(DisplayEntity.BlockDisplayEntity jukebox); +} diff --git a/src/main/java/com/kasetoatz/jukeboxboat/interfaces/IArmorStandEntity.java b/src/main/java/com/kasetoatz/jukeboxboat/interfaces/IArmorStandEntity.java new file mode 100644 index 0000000..cc70b15 --- /dev/null +++ b/src/main/java/com/kasetoatz/jukeboxboat/interfaces/IArmorStandEntity.java @@ -0,0 +1,8 @@ +package com.kasetoatz.jukeboxboat.interfaces; + +public interface IArmorStandEntity +{ + boolean jukeboxBoat$isPlaceholder(); + void jukeboxBoat$setPlaceholder(boolean value); + void jukeboxBoat$setMarker(boolean value); +} diff --git a/src/main/java/com/kasetoatz/jukeboxboat/mixin/AbstractBoatEntityMixin.java b/src/main/java/com/kasetoatz/jukeboxboat/mixin/AbstractBoatEntityMixin.java new file mode 100644 index 0000000..c1ea34a --- /dev/null +++ b/src/main/java/com/kasetoatz/jukeboxboat/mixin/AbstractBoatEntityMixin.java @@ -0,0 +1,204 @@ +package com.kasetoatz.jukeboxboat.mixin; + +import com.kasetoatz.jukeboxboat.interfaces.IAbstractBoatEntity; +import com.llamalad7.mixinextras.injector.ModifyReturnValue; +import com.llamalad7.mixinextras.sugar.Local; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.entity.Entity; +import net.minecraft.entity.decoration.DisplayEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.vehicle.AbstractBoatEntity; +import net.minecraft.entity.vehicle.BoatEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.network.packet.s2c.play.PositionFlag; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +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.EnumSet; +import java.util.UUID; + +import static com.kasetoatz.jukeboxboat.util.Util.*; + +@Mixin(AbstractBoatEntity.class) +public abstract class AbstractBoatEntityMixin implements IAbstractBoatEntity +{ + @Shadow protected abstract boolean canAddPassenger(Entity passenger); + + @Unique + private void setStoredDisc(ItemStack disc) + { + if ((Object)this instanceof BoatEntity boat) + { + if (disc.isEmpty()) + { + boat.setComponent(DataComponentTypes.CUSTOM_DATA, boat.get(DataComponentTypes.CUSTOM_DATA).apply(nbtCompound -> nbtCompound.remove("stored_disc"))); + } + else + { + boat.setComponent(DataComponentTypes.CUSTOM_DATA, boat.get(DataComponentTypes.CUSTOM_DATA).apply(nbtCompound -> nbtCompound.put("stored_disc", ItemStack.CODEC, disc))); + } + } + } + + @Unique + private void setLastStateChange() + { + if ((Object)this instanceof BoatEntity boat) + { + boat.setComponent(DataComponentTypes.CUSTOM_DATA, boat.get(DataComponentTypes.CUSTOM_DATA).apply(nbtCompound -> nbtCompound.putLong("last_state_change", System.currentTimeMillis()))); + } + } + + @Unique + private boolean canExecute() + { + if ((Object)this instanceof BoatEntity boat) + { + return System.currentTimeMillis() - boat.get(DataComponentTypes.CUSTOM_DATA).copyNbt().getLong("last_state_change").orElse(0L) > 100; + } + return true; + } + + @Override + public boolean jukeboxBoat$isJukeboxBoat() + { + if ((Object)this instanceof BoatEntity boat) + { + return boat.get(DataComponentTypes.CUSTOM_DATA).copyNbt().getBoolean("is_jukebox_boat").orElse(false); + } + return false; + } + + @Override + public void jukeboxBoat$setJukeboxBoat(boolean value) + { + if ((Object)this instanceof BoatEntity boat) + { + boat.setComponent(DataComponentTypes.CUSTOM_DATA, boat.get(DataComponentTypes.CUSTOM_DATA).apply(nbtCompound -> nbtCompound.putBoolean("is_jukebox_boat", value))); + } + } + + @Override + public ItemStack jukeboxBoat$getStoredDisc() + { + if ((Object)this instanceof BoatEntity boat) + { + return boat.get(DataComponentTypes.CUSTOM_DATA).copyNbt().get("stored_disc", ItemStack.CODEC).orElse(ItemStack.EMPTY); + } + return ItemStack.EMPTY; + } + + @Override + public DisplayEntity.BlockDisplayEntity jukeboxBoat$getJukebox() + { + if ((Object)this instanceof BoatEntity boat) + { + String uuid = boat.get(DataComponentTypes.CUSTOM_DATA).copyNbt().getString("jukebox", ""); + if (boat.getWorld().getEntity(UUID.fromString(uuid)) instanceof DisplayEntity.BlockDisplayEntity entity) + { + return entity; + } + } + return null; + } + + @Override + public void jukeboxBoat$setJukebox(DisplayEntity.BlockDisplayEntity jukebox) + { + if ((Object)this instanceof BoatEntity boat) + { + if (jukebox == null) + { + boat.setComponent(DataComponentTypes.CUSTOM_DATA, boat.get(DataComponentTypes.CUSTOM_DATA).apply(nbtCompound -> nbtCompound.remove("jukebox"))); + } + else + { + boat.setComponent(DataComponentTypes.CUSTOM_DATA, boat.get(DataComponentTypes.CUSTOM_DATA).apply(nbtCompound -> nbtCompound.putString("jukebox", jukebox.getUuidAsString()))); + } + } + } + + @ModifyReturnValue(method="interact", at=@At("RETURN")) + public ActionResult interact(ActionResult result, @Local(argsOnly=true) PlayerEntity player, @Local(argsOnly=true) Hand hand) + { + if ((Object)this instanceof BoatEntity boat) + { + if (result != ActionResult.PASS || !jukeboxBoat$isJukeboxBoat() || !canExecute()) + { + return result; + } + else if (canAddPassenger(player) && !player.shouldCancelInteraction()) + { + return ActionResult.PASS; + } + else if (!jukeboxBoat$getStoredDisc().isEmpty()) + { + ItemStack stack = jukeboxBoat$getStoredDisc(); + if (!stack.isEmpty()) + { + setPlaying(boat, false); + setStoredDisc(ItemStack.EMPTY); + player.getInventory().insertStack(stack); + } + replaceJukebox(boat); + setLastStateChange(); + } + else + { + ItemStack stack = player.getStackInHand(hand); + ItemStack storedDisc = stack.copy(); + SoundEvent sound = getDiscSound(player, storedDisc); + if (sound == null) + { + return ActionResult.PASS; + } + stack.splitUnlessCreative(1, player); + DisplayEntity.BlockDisplayEntity jukebox = jukeboxBoat$getJukebox(); + if (jukebox == null) + { + jukebox = createJukebox(boat); + } + player.getWorld().playSoundFromEntity( + null, + jukebox, + sound, + SoundCategory.RECORDS, + 1.0f, + 1.0f + ); + setPlaying(boat, true); + setStoredDisc(storedDisc); + setLastStateChange(); + } + return ActionResult.SUCCESS; + } + return ActionResult.PASS; + } + + @Inject(method="tick", at=@At("HEAD")) + public void tick(CallbackInfo ci) + { + if ((Object)this instanceof BoatEntity boat) + { + IAbstractBoatEntity accessor = (IAbstractBoatEntity)boat; + DisplayEntity.BlockDisplayEntity jukebox = jukeboxBoat$getJukebox(); + if (!accessor.jukeboxBoat$isJukeboxBoat() || jukebox == null) + { + return; + } + if (boat.getWorld() instanceof ServerWorld world) + { + jukebox.teleport(world, boat.getX(), boat.getY(), boat.getZ(), EnumSet.noneOf(PositionFlag.class), boat.getYaw() + 90, boat.getPitch(), false); + } + } + } +} diff --git a/src/main/java/com/kasetoatz/jukeboxboat/mixin/ArmorStandEntityMixin.java b/src/main/java/com/kasetoatz/jukeboxboat/mixin/ArmorStandEntityMixin.java new file mode 100644 index 0000000..0f1c0b0 --- /dev/null +++ b/src/main/java/com/kasetoatz/jukeboxboat/mixin/ArmorStandEntityMixin.java @@ -0,0 +1,38 @@ +package com.kasetoatz.jukeboxboat.mixin; + +import com.kasetoatz.jukeboxboat.interfaces.IArmorStandEntity; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.entity.decoration.ArmorStandEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(ArmorStandEntity.class) +public abstract class ArmorStandEntityMixin implements IArmorStandEntity +{ + @Shadow protected abstract void setMarker(boolean marker); + + @Override + public boolean jukeboxBoat$isPlaceholder() + { + if ((Object)this instanceof ArmorStandEntity entity) + { + return entity.get(DataComponentTypes.CUSTOM_DATA).copyNbt().getBoolean("is_placeholder").orElse(false); + } + return false; + } + + @Override + public void jukeboxBoat$setPlaceholder(boolean value) + { + if ((Object)this instanceof ArmorStandEntity entity) + { + entity.setComponent(DataComponentTypes.CUSTOM_DATA, entity.get(DataComponentTypes.CUSTOM_DATA).apply(nbtCompound -> nbtCompound.putBoolean("is_placeholder", value))); + } + } + + @Override + public void jukeboxBoat$setMarker(boolean value) + { + setMarker(value); + } +} \ No newline at end of file diff --git a/src/main/java/com/kasetoatz/jukeboxboat/mixin/BoatItemMixin.java b/src/main/java/com/kasetoatz/jukeboxboat/mixin/BoatItemMixin.java new file mode 100644 index 0000000..6c8ae93 --- /dev/null +++ b/src/main/java/com/kasetoatz/jukeboxboat/mixin/BoatItemMixin.java @@ -0,0 +1,44 @@ +package com.kasetoatz.jukeboxboat.mixin; + +import com.kasetoatz.jukeboxboat.interfaces.IAbstractBoatEntity; +import com.llamalad7.mixinextras.sugar.Local; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.entity.vehicle.AbstractBoatEntity; +import net.minecraft.entity.vehicle.BoatEntity; +import net.minecraft.item.BoatItem; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import static com.kasetoatz.jukeboxboat.util.Util.createJukebox; +import static com.kasetoatz.jukeboxboat.util.Util.spawnPlaceholder; + +@Mixin(BoatItem.class) +public class BoatItemMixin +{ + @Inject(method="use", at=@At(value="INVOKE", target="Lnet/minecraft/entity/vehicle/AbstractBoatEntity;setYaw(F)V")) + public void use(CallbackInfoReturnable cir, @Local ItemStack stack, @Local AbstractBoatEntity abstractBoat) + { + if (abstractBoat instanceof BoatEntity boat) + { + boolean isJukeboxBoat = false; + Text name = stack.get(DataComponentTypes.ITEM_NAME); + if (name != null) + { + isJukeboxBoat = name.getString().equals("Boat with Jukebox"); + } + IAbstractBoatEntity accessor = (IAbstractBoatEntity)boat; + accessor.jukeboxBoat$setJukeboxBoat(isJukeboxBoat); + if (!isJukeboxBoat) + { + return; + } + spawnPlaceholder(boat); + accessor.jukeboxBoat$setJukebox(createJukebox(boat)); + } + } +} diff --git a/src/main/java/com/kasetoatz/jukeboxboat/mixin/ShapelessRecipeMixin.java b/src/main/java/com/kasetoatz/jukeboxboat/mixin/ShapelessRecipeMixin.java new file mode 100644 index 0000000..84f2f02 --- /dev/null +++ b/src/main/java/com/kasetoatz/jukeboxboat/mixin/ShapelessRecipeMixin.java @@ -0,0 +1,32 @@ +package com.kasetoatz.jukeboxboat.mixin; + +import com.llamalad7.mixinextras.injector.ModifyReturnValue; +import com.llamalad7.mixinextras.sugar.Local; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.ShapelessRecipe; +import net.minecraft.recipe.input.CraftingRecipeInput; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(ShapelessRecipe.class) +public abstract class ShapelessRecipeMixin +{ + @Shadow public abstract String getGroup(); + + @ModifyReturnValue(method="craft(Lnet/minecraft/recipe/input/CraftingRecipeInput;Lnet/minecraft/registry/RegistryWrapper$WrapperLookup;)Lnet/minecraft/item/ItemStack;", at=@At("RETURN")) + public ItemStack craft(ItemStack original, @Local(argsOnly = true) CraftingRecipeInput input) + { + if (!original.isEmpty() && input.getStacks().stream().anyMatch(stack -> stack.getName().getString().equals("Boat with Jukebox"))) + { + return ItemStack.EMPTY; + } + if (getGroup().equals("jukebox_boat")) + { + original.set(DataComponentTypes.ITEM_NAME, Text.of("Boat with Jukebox")); + } + return original; + } +} diff --git a/src/main/java/com/kasetoatz/jukeboxboat/mixin/VehicleEntityMixin.java b/src/main/java/com/kasetoatz/jukeboxboat/mixin/VehicleEntityMixin.java new file mode 100644 index 0000000..b3ac5ac --- /dev/null +++ b/src/main/java/com/kasetoatz/jukeboxboat/mixin/VehicleEntityMixin.java @@ -0,0 +1,52 @@ +package com.kasetoatz.jukeboxboat.mixin; + +import com.kasetoatz.jukeboxboat.interfaces.IAbstractBoatEntity; +import com.llamalad7.mixinextras.sugar.Local; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.entity.decoration.DisplayEntity; +import net.minecraft.entity.vehicle.BoatEntity; +import net.minecraft.entity.vehicle.VehicleEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import static com.kasetoatz.jukeboxboat.util.Util.removePlaceholder; + +@Mixin(VehicleEntity.class) +public abstract class VehicleEntityMixin +{ + @Inject(method="killAndDropItem", at=@At("HEAD")) + public void preKill(CallbackInfo ci) + { + if ((Object)this instanceof BoatEntity boat) + { + IAbstractBoatEntity accessor = (IAbstractBoatEntity)boat; + DisplayEntity.BlockDisplayEntity jukebox = accessor.jukeboxBoat$getJukebox(); + if (jukebox != null) + { + jukebox.discard(); + accessor.jukeboxBoat$setJukebox(null); + } + removePlaceholder(boat); + } + } + + @Inject(method="killAndDropItem", at=@At(value="INVOKE", target="Lnet/minecraft/entity/vehicle/VehicleEntity;dropStack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/entity/ItemEntity;")) + public void killAndDropItem(CallbackInfo ci, @Local(argsOnly=true) ServerWorld world, @Local ItemStack stack) + { + if ((Object)this instanceof BoatEntity boat) + { + IAbstractBoatEntity accessor = (IAbstractBoatEntity)boat; + ItemStack disc = accessor.jukeboxBoat$getStoredDisc(); + if (!disc.isEmpty()) + { + boat.dropStack(world, disc); + } + stack.set(DataComponentTypes.ITEM_NAME, Text.of("Boat with Jukebox")); + } + } +} diff --git a/src/main/java/com/kasetoatz/jukeboxboat/util/Util.java b/src/main/java/com/kasetoatz/jukeboxboat/util/Util.java new file mode 100644 index 0000000..f191702 --- /dev/null +++ b/src/main/java/com/kasetoatz/jukeboxboat/util/Util.java @@ -0,0 +1,104 @@ +package com.kasetoatz.jukeboxboat.util; + +import com.kasetoatz.jukeboxboat.interfaces.IAbstractBoatEntity; +import com.kasetoatz.jukeboxboat.interfaces.IArmorStandEntity; +import net.minecraft.block.Blocks; +import net.minecraft.block.JukeboxBlock; +import net.minecraft.block.jukebox.JukeboxSong; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.JukeboxPlayableComponent; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.decoration.ArmorStandEntity; +import net.minecraft.entity.decoration.DisplayEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.vehicle.BoatEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.math.AffineTransformation; +import org.joml.Quaternionf; +import org.joml.Vector3f; + +import java.util.Optional; + +public class Util +{ + public static SoundEvent getDiscSound(PlayerEntity player, ItemStack disc) + { + JukeboxPlayableComponent component = disc.get(DataComponentTypes.JUKEBOX_PLAYABLE); + Optional> key = player.getWorld().getRegistryManager().getOptional(RegistryKeys.JUKEBOX_SONG); + if (component == null || key.isEmpty()) + { + return null; + } + return component.song().resolveValue(key.get()).map(song -> song.soundEvent().value()).orElse(null); + } + + public static void setPlaying(BoatEntity boat, boolean playing) + { + DisplayEntity.BlockDisplayEntity jukebox = ((IAbstractBoatEntity)boat).jukeboxBoat$getJukebox(); + if (jukebox != null) + { + if (playing) + { + jukebox.setBlockState(Blocks.JUKEBOX.getDefaultState().with(JukeboxBlock.HAS_RECORD, true)); + } + else + { + jukebox.setBlockState(Blocks.JUKEBOX.getDefaultState()); + } + } + } + + public static DisplayEntity.BlockDisplayEntity createJukebox(BoatEntity boat) + { + DisplayEntity.BlockDisplayEntity jukebox = new DisplayEntity.BlockDisplayEntity(EntityType.BLOCK_DISPLAY, boat.getWorld()); + jukebox.setBlockState(Blocks.JUKEBOX.getDefaultState()); + jukebox.setTransformation(new AffineTransformation( + new Vector3f(-0.8f, 0.2f, -0.4f), + new Quaternionf(), + new Vector3f(0.8f, 0.8f, 0.8f), + new Quaternionf() + )); + boat.getWorld().spawnEntity(jukebox); + return jukebox; + } + + public static void spawnPlaceholder(BoatEntity boat) + { + ArmorStandEntity placeholder = new ArmorStandEntity(boat.getWorld(), boat.getX(), boat.getY(), boat.getZ()); + IArmorStandEntity accessor = (IArmorStandEntity)placeholder; + accessor.jukeboxBoat$setPlaceholder(true); + accessor.jukeboxBoat$setMarker(true); + placeholder.setHideBasePlate(true); + placeholder.setInvisible(true); + placeholder.setInvulnerable(true); + boat.getWorld().spawnEntity(placeholder); + placeholder.startRiding(boat); + } + + public static void removePlaceholder(BoatEntity boat) + { + for (Entity entity : boat.getPassengerList()) + { + if (entity instanceof ArmorStandEntity armorStand && ((IArmorStandEntity)armorStand).jukeboxBoat$isPlaceholder()) + { + armorStand.discard(); + } + } + } + + public static void replaceJukebox(BoatEntity boat) + { + IAbstractBoatEntity accessor = (IAbstractBoatEntity)boat; + DisplayEntity.BlockDisplayEntity old = accessor.jukeboxBoat$getJukebox(); + if (old != null) + { + old.discard(); + } + DisplayEntity.BlockDisplayEntity jukebox = createJukebox(boat); + accessor.jukeboxBoat$setJukebox(jukebox); + } +} diff --git a/src/main/resources/data/jukeboxboat/recipe/acacia_boat_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/acacia_boat_with_jukebox.json new file mode 100644 index 0000000..1914bae --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/acacia_boat_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:acacia_boat", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:acacia_boat", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jukeboxboat/recipe/bamboo_raft_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/bamboo_raft_with_jukebox.json new file mode 100644 index 0000000..4809622 --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/bamboo_raft_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:bamboo_raft", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:bamboo_raft", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jukeboxboat/recipe/birch_boat_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/birch_boat_with_jukebox.json new file mode 100644 index 0000000..4cf6dfd --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/birch_boat_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:birch_boat", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:birch_boat", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jukeboxboat/recipe/cherry_boat_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/cherry_boat_with_jukebox.json new file mode 100644 index 0000000..ab7686c --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/cherry_boat_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:cherry_boat", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:cherry_boat", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jukeboxboat/recipe/dark_oak_boat_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/dark_oak_boat_with_jukebox.json new file mode 100644 index 0000000..566c518 --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/dark_oak_boat_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:dark_oak_boat", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:dark_oak_boat", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jukeboxboat/recipe/jungle_boat_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/jungle_boat_with_jukebox.json new file mode 100644 index 0000000..880446c --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/jungle_boat_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:jungle_boat", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:jungle_boat", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jukeboxboat/recipe/mangrove_boat_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/mangrove_boat_with_jukebox.json new file mode 100644 index 0000000..a08d070 --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/mangrove_boat_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:mangrove_boat", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:mangrove_boat", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jukeboxboat/recipe/oak_boat_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/oak_boat_with_jukebox.json new file mode 100644 index 0000000..8cf5604 --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/oak_boat_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:oak_boat", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:oak_boat", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jukeboxboat/recipe/pale_oak_boat_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/pale_oak_boat_with_jukebox.json new file mode 100644 index 0000000..0b2f7db --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/pale_oak_boat_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:pale_oak_boat", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:pale_oak_boat", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/jukeboxboat/recipe/spruce_boat_with_jukebox.json b/src/main/resources/data/jukeboxboat/recipe/spruce_boat_with_jukebox.json new file mode 100644 index 0000000..2d650be --- /dev/null +++ b/src/main/resources/data/jukeboxboat/recipe/spruce_boat_with_jukebox.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "jukebox_boat", + "ingredients": [ + "minecraft:spruce_boat", + "minecraft:jukebox" + ], + "result": { + "id": "minecraft:spruce_boat", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..8e9ca64 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,19 @@ +{ + "schemaVersion": 1, + "id": "jukeboxboat", + "version": "${version}", + "name": "JukeboxBoat", + "description": "", + "authors": [], + "contact": {}, + "license": "MIT", + "environment": "*", + "mixins": [ + "jukeboxboat.mixins.json" + ], + "depends": { + "fabricloader": ">=${loader_version}", + "fabric": "*", + "minecraft": "${minecraft_version}" + } +} diff --git a/src/main/resources/jukeboxboat.mixins.json b/src/main/resources/jukeboxboat.mixins.json new file mode 100644 index 0000000..4bf2c9a --- /dev/null +++ b/src/main/resources/jukeboxboat.mixins.json @@ -0,0 +1,19 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.kasetoatz.jukeboxboat.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "AbstractBoatEntityMixin", + "ArmorStandEntityMixin", + "BoatItemMixin", + "ShapelessRecipeMixin", + "VehicleEntityMixin" + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +}