ChomeNS/SongPlayer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow interaction with chest or item frame when holding song item

Browse source
This commit is contained in:
hhhzzzsss 2023-06-19 22:18:18 -05:00
parent ca7964dea1
commit 83651896eb
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/com/github/hhhzzzsss/songplayer/mixin/MinecraftClientMixin.java
View file

@ -5,10 +5,22 @@ import com.github.hhhzzzsss.songplayer.item.SongItemConfirmationScreen;
import com.github.hhhzzzsss.songplayer.item.SongItemUtils;
import com.github.hhhzzzsss.songplayer.playing.ProgressDisplay;
import com.github.hhhzzzsss.songplayer.playing.SongHandler;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockWithEntity;
import net.minecraft.block.ChestBlock;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.LockableContainerBlockEntity;
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.Entity;
import net.minecraft.entity.decoration.GlowItemFrameEntity;
import net.minecraft.entity.decoration.ItemFrameEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.hit.EntityHitResult;
import net.minecraft.util.hit.HitResult;
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;
@ -17,6 +29,9 @@ import java.io.IOException;
@Mixin(MinecraftClient.class)
public class MinecraftClientMixin {
@Shadow
public HitResult crosshairTarget;
@Inject(at = @At("HEAD"), method = "render(Z)V")
public void onRender(boolean tick, CallbackInfo ci) {
if (SongPlayer.MC.world != null && SongPlayer.MC.player != null && SongPlayer.MC.interactionManager != null) {
@ -36,6 +51,23 @@ public class MinecraftClientMixin {
@Inject(at = @At("HEAD"), method = "doItemUse()V", cancellable = true)
private void onDoItemUse(CallbackInfo ci) {
if (crosshairTarget != null) {
if (crosshairTarget.getType() == HitResult.Type.ENTITY) {
EntityHitResult entityHitResult = (EntityHitResult)this.crosshairTarget;
Entity entity = entityHitResult.getEntity();
if (entity instanceof ItemFrameEntity || entity instanceof GlowItemFrameEntity) {
return;
}
}
else if (crosshairTarget.getType() == HitResult.Type.BLOCK) {
BlockHitResult blockHitResult = (BlockHitResult)this.crosshairTarget;
BlockEntity blockEntity = SongPlayer.MC.world.getBlockEntity(blockHitResult.getBlockPos());
if (blockEntity != null && blockEntity instanceof LockableContainerBlockEntity) {
return;
}
}
}
ItemStack stack = SongPlayer.MC.player.getStackInHand(Hand.MAIN_HAND);
if (SongItemUtils.isSongItem(stack)) {
try {