MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge

Browse source
This commit is contained in:
paulevsGitch 2020-11-08 01:35:16 +03:00
parent 452fbf0497
commit 76804a4f09
4 changed files with 252 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/ru/betterend/blocks/InfusionPedestal.java
View file

@ -5,10 +5,15 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.ShapeContext;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import ru.betterend.blocks.basis.BlockPedestal;
import ru.betterend.blocks.entities.InfusionPedestalEntity;
@ -21,6 +26,12 @@ public class InfusionPedestal extends BlockPedestal {
this.height = 1.08F;
}
@Override
public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
ActionResult result = super.onUse(state, world, pos, player, hand, hit);
return result;
}
@Override
public BlockEntity createBlockEntity(BlockView world) {
return new InfusionPedestalEntity();

12
src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java
View file

@ -1,5 +1,8 @@
package ru.betterend.blocks.entities;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundTag;
import ru.betterend.rituals.InfusionRitual;
public class InfusionPedestalEntity extends PedestalBlockEntity {
@ -9,5 +12,14 @@ public class InfusionPedestalEntity extends PedestalBlockEntity {
public boolean hasRitual() {
return this.activeRitual != null;
}
@Override
public void fromTag(BlockState state, CompoundTag tag) {
super.fromTag(state, tag);
}
@Override
public CompoundTag toTag(CompoundTag tag) {
return super.toTag(tag);
}
}