Skip to content

Commit

Permalink
Fix Valkyrien Skies compat (#362)
Browse files Browse the repository at this point in the history
  • Loading branch information
@grappigegovert
grappigegovert authored Sep 7, 2024
1 parent 9cc77c1 commit 9f4bc97
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 60 deletions.
88 changes: 28 additions & 60 deletions common/src/main/java/whocraft/tardis_refined/common/block/shell/RootedShellBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
import net.minecraft.core.Direction;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionHand;
Expand All @@ -17,16 +14,15 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import whocraft.tardis_refined.TardisRefined;
import whocraft.tardis_refined.common.blockentity.shell.RootedShellBlockEntity;
import whocraft.tardis_refined.common.blockentity.shell.ShellBaseBlockEntity;
import whocraft.tardis_refined.common.capability.TardisLevelOperator;
import whocraft.tardis_refined.common.dimension.DimensionHandler;
import whocraft.tardis_refined.common.tardis.TardisDesktops;
import whocraft.tardis_refined.common.tardis.TardisNavLocation;
import whocraft.tardis_refined.common.tardis.manager.TardisExteriorManager;
Expand All @@ -49,69 +45,41 @@ public RootedShellBlock(BlockBehaviour.Properties properties) {

@Override
public InteractionResult use(BlockState blockState, Level level, BlockPos blockPos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult) {
if (!player.level().isClientSide()){
if(!player.getMainHandItem().is(Items.SHEARS)) {
if (!blockState.getValue(OPEN)) { //If there are roots covering the entrance, tell the player
PlayerUtil.sendMessage(player, Component.translatable(ModMessages.ROOT_PLANT_CUT_OPEN), true);
level.playSound(player, blockPos, SoundEvents.AZALEA_LEAVES_HIT, SoundSource.BLOCKS, 1, 0.75f + level.getRandom().nextFloat());
return InteractionResult.sidedSuccess(false); //Use InteractionResult.sidedSuccess(false) for serverside side. Stops hand swinging twice. If InteractionResult = SUCCESS then the hand swing packet is sent twice.
}
return InteractionResult.FAIL; //Return fail result if the entrance is now opened, so that we don't play the message and exit this method early.
if (!player.getMainHandItem().is(Items.SHEARS)) {
if (!blockState.getValue(OPEN)) { //If there are roots covering the entrance, tell the player
PlayerUtil.sendMessage(player, Component.translatable(ModMessages.ROOT_PLANT_CUT_OPEN), true);
level.playSound(player, blockPos, SoundEvents.AZALEA_LEAVES_HIT, SoundSource.BLOCKS, 1, 0.75f + level.getRandom().nextFloat());
return InteractionResult.sidedSuccess(level.isClientSide); //Stops hand swinging twice. If InteractionResult = SUCCESS then the hand swing packet is sent twice.
}

//From now one, we assume that the player is holding a vanilla Shears item in their main hand. We will try to generate the Tardis dimension if it doesn't exist, then open the root shell door
this.setUpTardis(blockState, level, blockPos);

//Logic to play sounds if the player tries to break the root plant for additional sound design
if (player != null) {
player.getMainHandItem().hurtAndBreak(1, player, entity -> entity.broadcastBreakEvent(interactionHand));
level.playSound(player, player.blockPosition(), SoundEvents.GROWING_PLANT_CROP, SoundSource.BLOCKS, 1.0f, 1.0f);
level.playSound(player, player.blockPosition(), SoundEvents.SLIME_JUMP, SoundSource.BLOCKS, 1.0f, 1.0f);
}
return InteractionResult.sidedSuccess(false); //Use InteractionResult.sidedSuccess(false) for serverside side. Stops hand swinging twice. If InteractionResult = SUCCESS then the hand swing packet is sent twice.
return InteractionResult.FAIL; //Return fail result if the entrance is now opened, so that we don't play the message and exit this method early.
}
return InteractionResult.sidedSuccess(true); //Use InteractionResult.sidedSuccess(true) which returns InteractionResult.SUCCESS, which prevents the ShellBaseBlockEntity generating another UUID and causing a second dimension to be created.
}

/** Generate the dimension and opens the Root Shell assuming that the player is holding the vanilla Shears item */
private boolean setUpTardis(BlockState blockState, Level level, BlockPos blockPos){
if (level instanceof ServerLevel serverLevel) {
if (level.getBlockEntity(blockPos) instanceof ShellBaseBlockEntity shellBaseBlockEntity) {
if (shellBaseBlockEntity.shouldSetup()){

//Create a Level Key with a randomised UUID
ResourceKey<Level> generatedLevelKey = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(TardisRefined.MODID, UUID.randomUUID().toString()));

//Create the Level on demand which will create our capability
ServerLevel interior = DimensionHandler.getOrCreateInterior(serverLevel, generatedLevelKey.location());
//From now one, we assume that the player is holding a vanilla Shears item in their main hand. We will try to generate the Tardis dimension if it doesn't exist, then open the root shell door
if (level.getBlockEntity(blockPos) instanceof RootedShellBlockEntity rootedShellBlockEntity) {
rootedShellBlockEntity.setUpTardisOnNextTick();
}

// Set the UUID on the block entity.
shellBaseBlockEntity.setTardisId(generatedLevelKey);
//Logic to play sounds if the player tries to break the root plant for additional sound design
if (player != null) {
player.getMainHandItem().hurtAndBreak(1, player, entity -> entity.broadcastBreakEvent(interactionHand));
level.playSound(player, player.blockPosition(), SoundEvents.GROWING_PLANT_CROP, SoundSource.BLOCKS, 1.0f, 1.0f);
level.playSound(player, player.blockPosition(), SoundEvents.SLIME_JUMP, SoundSource.BLOCKS, 1.0f, 1.0f);
}

TardisLevelOperator.get(interior).ifPresent(tardisLevelOperator -> {
if (!tardisLevelOperator.hasInitiallyGenerated()) {
tardisLevelOperator.setupInitialCave(serverLevel, blockState, blockPos);
}
//After we setup the data and desktop, open the doors.
tardisLevelOperator.setDoorClosed(false);
serverLevel.playSound(null, blockPos, SoundEvents.SHEEP_SHEAR, SoundSource.BLOCKS, 1, 1);
});
return InteractionResult.sidedSuccess(level.isClientSide); //Stops hand swinging twice. If InteractionResult = SUCCESS then the hand swing packet is sent twice.
}

return true;
}
else {
if (TardisLevelOperator.get(serverLevel).isPresent()){
TardisLevelOperator tardisLevelOperator = TardisLevelOperator.get(serverLevel).get();
//Always open the root shell doors when this method is called to ensure that the player isn't softlocked by the early return of InteractionResult that occurs if the player isn't using shears.
tardisLevelOperator.setDoorClosed(false);
return true;
}
}
@Nullable
@Override
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
return (level1, blockPos, block, t) -> {
if (t instanceof RootedShellBlockEntity rootedShellBlockEntity) {
rootedShellBlockEntity.tick(level1, blockPos, blockState, rootedShellBlockEntity);
}
}
return false;
};
}


@Nullable
@Override
public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
Expand Down
58 changes: 58 additions & 0 deletions ...rc/main/java/whocraft/tardis_refined/common/blockentity/shell/RootedShellBlockEntity.java
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
package whocraft.tardis_refined.common.blockentity.shell;

import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import whocraft.tardis_refined.TardisRefined;
import whocraft.tardis_refined.common.capability.TardisLevelOperator;
import whocraft.tardis_refined.common.dimension.DimensionHandler;
import whocraft.tardis_refined.common.tardis.TardisDesktops;
import whocraft.tardis_refined.common.tardis.themes.DesktopTheme;
import whocraft.tardis_refined.common.util.Platform;
import whocraft.tardis_refined.registry.TRBlockEntityRegistry;

import java.util.UUID;

public class RootedShellBlockEntity extends ShellBaseBlockEntity{
public RootedShellBlockEntity(BlockPos blockPos, BlockState blockState) {
super(TRBlockEntityRegistry.ROOT_SHELL.get(), blockPos, blockState);
}

private boolean runSetUpOnNextTick = false;

@Override
public DesktopTheme getAssociatedTheme() {
return TardisDesktops.DEFAULT_OVERGROWN_THEME;
Expand All @@ -25,4 +40,47 @@ public void playDoorCloseSound(boolean closeDoor) {
public void playDoorLockedSound(boolean lockDoor) {
//Leave blank
}

@Override
public void tick(Level level, BlockPos blockPos, BlockState blockState, ShellBaseBlockEntity blockEntity) {
if (runSetUpOnNextTick) {
this.runSetUpOnNextTick = false;
setUpTardis(blockState, level, blockPos);
}
}

public void setUpTardisOnNextTick() {
runSetUpOnNextTick = true;
}

/** Generate the dimension and open the Root Shell */
private void setUpTardis(BlockState blockState, Level level, BlockPos blockPos) {
if (level instanceof ServerLevel serverLevel) {
if (this.shouldSetup()) {
//Create a Level Key with a randomised UUID
ResourceKey<Level> generatedLevelKey = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(TardisRefined.MODID, UUID.randomUUID().toString()));

//Create the Level on demand which will create our capability
ServerLevel interior = DimensionHandler.getOrCreateInterior(serverLevel, generatedLevelKey.location());

// Set the UUID on the block entity.
this.setTardisId(generatedLevelKey);

TardisLevelOperator.get(interior).ifPresent(tardisLevelOperator -> {
if (!tardisLevelOperator.hasInitiallyGenerated()) {
tardisLevelOperator.setupInitialCave(serverLevel, blockState, blockPos);
}
//After we setup the data and desktop, open the doors.
tardisLevelOperator.setDoorClosed(false);
serverLevel.playSound(null, blockPos, SoundEvents.SHEEP_SHEAR, SoundSource.BLOCKS, 1, 1);
});
} else {
ServerLevel tardisLevel = Platform.getServer().getLevel(getTardisId());
TardisLevelOperator.get(tardisLevel).ifPresent(tardisLevelOperator -> {
//Always open the root shell doors when this method is called to ensure that the player isn't softlocked by the early return of InteractionResult that occurs if the player isn't using shears.
tardisLevelOperator.setDoorClosed(false);
});
}
}
}
}

0 comments on commit 9f4bc97

Please sign in to comment.