Skip to content

Commit

Permalink
Allowed Sonic to switch between Enabled and Disabled modes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jeryn99
Jeryn99 committed Dec 8, 2024
1 parent 4f7999f commit 7afe86d
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 52 deletions.
4 changes: 2 additions & 2 deletions .../java/whocraft/tardis_refined/common/blockentity/device/AstralManipulatorBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void load(CompoundTag tag) {
public void onRightClick(ItemStack itemStack, Player player) {
if (itemStack.getItem() instanceof ScrewdriverItem screwdriverItem) {
if (!screwdriverItem.isScrewdriverMode(itemStack, ScrewdriverMode.DRAWING)) {
screwdriverItem.setScrewdriverMode(itemStack, ScrewdriverMode.DRAWING, getBlockPos(), null);
screwdriverItem.setScrewdriverMode(player, itemStack, ScrewdriverMode.DRAWING, getBlockPos(), null);
setShouldDisplay(true);
PlayerUtil.sendMessage(player, Component.translatable(ModMessages.ASTRAL_MANIPULATOR_ENGAGED), true);

Expand All @@ -135,7 +135,7 @@ public void onRightClick(ItemStack itemStack, Player player) {
} else {

List<BlockPos> points = screwdriverItem.getScrewdriverPoint(itemStack);
screwdriverItem.setScrewdriverMode(itemStack, ScrewdriverMode.DISABLED, getBlockPos(), null);
screwdriverItem.setScrewdriverMode(player, itemStack, ScrewdriverMode.DISABLED, getBlockPos(), null);

if (points.size() == 2) {
BlockPos pointA = points.get(0);
Expand Down
77 changes: 39 additions & 38 deletions common/src/main/java/whocraft/tardis_refined/common/items/ScrewdriverItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.*;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import org.jetbrains.annotations.Nullable;
import whocraft.tardis_refined.common.blockentity.device.AstralManipulatorBlockEntity;
import whocraft.tardis_refined.common.util.PlayerUtil;
import whocraft.tardis_refined.constants.ModMessages;
import whocraft.tardis_refined.registry.TRBlockRegistry;
import whocraft.tardis_refined.registry.TRSoundRegistry;
Expand Down Expand Up @@ -51,55 +49,58 @@ public int getColor(ItemStack itemStack) {

@Override
public InteractionResult useOn(UseOnContext context) {


if (context.getLevel() instanceof ServerLevel serverLevel) {

if (context.getPlayer().isCrouching()) {
setScrewdriverMode(context.getItemInHand(), ScrewdriverMode.DISABLED, context.getClickedPos(), serverLevel);
} else {

if (isScrewdriverMode(context.getItemInHand(), ScrewdriverMode.DRAWING) && context.getLevel().getBlockState(context.getClickedPos()).getBlock() != TRBlockRegistry.ASTRAL_MANIPULATOR_BLOCK.get()) {
addBlockPosToScrewdriver(serverLevel, context.getPlayer(), context.getItemInHand(), context.getClickedPos());
}
}
if (!(context.getLevel() instanceof ServerLevel serverLevel)) {
return super.useOn(context);
}

var player = context.getPlayer();
var itemInHand = context.getItemInHand();
var clickedPos = context.getClickedPos();
var blockState = context.getLevel().getBlockState(clickedPos);

if (player.isCrouching()) {
ScrewdriverMode newMode = isScrewdriverMode(itemInHand, ScrewdriverMode.ENABLED)
? ScrewdriverMode.DISABLED
: ScrewdriverMode.ENABLED;
setScrewdriverMode(context.getPlayer(), itemInHand, newMode, clickedPos, serverLevel);
} else if (isScrewdriverMode(itemInHand, ScrewdriverMode.DRAWING)
&& blockState.getBlock() != TRBlockRegistry.ASTRAL_MANIPULATOR_BLOCK.get()) {
addBlockPosToScrewdriver(serverLevel, player, itemInHand, clickedPos);
}

return super.useOn(context);
}

public void setScrewdriverMode(ItemStack stack, ScrewdriverMode mode, BlockPos sourceChange, @Nullable ServerLevel serverLevel) {
CompoundTag itemtag = stack.getOrCreateTag();

if (itemtag.contains(SCREWDRIVER_MODE)) {
ScrewdriverMode currentMode = ScrewdriverMode.valueOf(itemtag.getString(SCREWDRIVER_MODE));

public void setScrewdriverMode(Player player, ItemStack stack, ScrewdriverMode mode, BlockPos sourceChange, @Nullable ServerLevel serverLevel) {
CompoundTag itemTag = stack.getOrCreateTag();
ScrewdriverMode currentMode = itemTag.contains(SCREWDRIVER_MODE)
? ScrewdriverMode.valueOf(itemTag.getString(SCREWDRIVER_MODE))
: ScrewdriverMode.DISABLED;

if (serverLevel != null) {
if (currentMode != ScrewdriverMode.DISABLED && mode == ScrewdriverMode.DISABLED) {
if (serverLevel != null) {
playScrewdriverSound(serverLevel, sourceChange, TRSoundRegistry.SCREWDRIVER_DISCARD.get());
}
// Play the disabled sound when transitioning to DISABLED mode
playScrewdriverSound(serverLevel, sourceChange, TRSoundRegistry.SCREWDRIVER_DISCARD.get());
}

if (currentMode == ScrewdriverMode.DRAWING && mode == ScrewdriverMode.DISABLED) {

if (serverLevel != null) {
clearLinkedManipulator(serverLevel, stack);
}


if (currentMode == ScrewdriverMode.DRAWING && mode != ScrewdriverMode.DRAWING) {
// Clear manipulator if leaving DRAWING mode
clearLinkedManipulator(serverLevel, stack);
}
}

itemtag.putString(SCREWDRIVER_MODE, mode.toString());
// Update the mode in the item's NBT
itemTag.putString(SCREWDRIVER_MODE, mode.toString());

if (mode == ScrewdriverMode.DRAWING) {
itemtag.put(LINKED_MANIPULATOR_POS, NbtUtils.writeBlockPos(sourceChange));
// Save manipulator position for DRAWING mode
itemTag.put(LINKED_MANIPULATOR_POS, NbtUtils.writeBlockPos(sourceChange));
}

stack.setTag(itemtag);
PlayerUtil.sendMessage(player, mode.toString(), true);
stack.setTag(itemTag);
}


public boolean isScrewdriverMode(ItemStack stack, ScrewdriverMode mode) {
CompoundTag itemtag = stack.getOrCreateTag();

Expand Down Expand Up @@ -128,7 +129,7 @@ private void addBlockPosToScrewdriver(ServerLevel serverLevel, Player player, It
}

itemtag.put(target, NbtUtils.writeBlockPos(pos));
updatedLinkedManipulator((ServerLevel) player.level(), stack, pos, isUpdatingA);
updatedLinkedManipulator(player, (ServerLevel) player.level(), stack, pos, isUpdatingA);

itemtag.putBoolean(SCREWDRIVER_B_WAS_LAST_UPDATED, !isUpdatingA);
stack.setTag(itemtag);
Expand All @@ -140,14 +141,14 @@ public void playScrewdriverSound(ServerLevel level, BlockPos pos, SoundEvent sou
level.playSound(null, pos.getX(), pos.getY(), pos.getZ(), soundEvent, SoundSource.PLAYERS, 1, 0.875f + level.getRandom().nextFloat() / 4);
}

private void updatedLinkedManipulator(ServerLevel level, ItemStack stack, BlockPos pos, boolean isPointA) {
private void updatedLinkedManipulator(Player player, ServerLevel level, ItemStack stack, BlockPos pos, boolean isPointA) {
CompoundTag itemtag = stack.getOrCreateTag();
if (itemtag.contains(LINKED_MANIPULATOR_POS)) {
BlockPos manipulator = NbtUtils.readBlockPos(itemtag.getCompound(LINKED_MANIPULATOR_POS));
if (level.getBlockEntity(manipulator) instanceof AstralManipulatorBlockEntity astralManipulatorBlockEntity) {

if (!astralManipulatorBlockEntity.setProjectionBlockPos(pos, isPointA)) {
setScrewdriverMode(stack, ScrewdriverMode.DISABLED, pos, level);
setScrewdriverMode(player, stack, ScrewdriverMode.DISABLED, pos, level);
}

}
Expand Down
13 changes: 1 addition & 12 deletions common/src/main/java/whocraft/tardis_refined/common/items/ScrewdriverMode.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
package whocraft.tardis_refined.common.items;

public enum ScrewdriverMode {

// *
// Repurposed screwdriver mode - for future use.
// * //
GENERIC,
// *
// No functionality on right click
// * //
ENABLED,
DISABLED,
// *
// Drawing for projection
// * //
DRAWING

}

0 comments on commit 7afe86d

Please sign in to comment.