From 7d178dedb07f3a040236532c8ca23b16bb3b1161 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 22 Jan 2021 23:08:08 +0300 Subject: [PATCH] Function optimisation --- src/main/java/ru/betterend/blocks/EternalPedestal.java | 3 +++ src/main/java/ru/betterend/blocks/InfusionPedestal.java | 3 +++ src/main/java/ru/betterend/blocks/basis/PedestalBlock.java | 6 ++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/EternalPedestal.java b/src/main/java/ru/betterend/blocks/EternalPedestal.java index deef385c..b64b05be 100644 --- a/src/main/java/ru/betterend/blocks/EternalPedestal.java +++ b/src/main/java/ru/betterend/blocks/EternalPedestal.java @@ -68,6 +68,9 @@ public class EternalPedestal extends PedestalBlock { return result; } + @Override + protected void activate(World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {} + @Override public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { BlockState updated = super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); diff --git a/src/main/java/ru/betterend/blocks/InfusionPedestal.java b/src/main/java/ru/betterend/blocks/InfusionPedestal.java index d8562937..0e57bb94 100644 --- a/src/main/java/ru/betterend/blocks/InfusionPedestal.java +++ b/src/main/java/ru/betterend/blocks/InfusionPedestal.java @@ -61,6 +61,9 @@ public class InfusionPedestal extends PedestalBlock { return result; } + @Override + protected void activate(World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {} + @Override public BlockEntity createBlockEntity(BlockView world) { return new InfusionPedestalEntity(); diff --git a/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java b/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java index b4402901..1cc317c9 100644 --- a/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java @@ -114,9 +114,7 @@ public class PedestalBlock extends BlockBaseNotFull implements BlockEntityProvid ItemStack itemStack = player.getStackInHand(hand); if (itemStack.isEmpty()) return ActionResult.CONSUME; pedestal.setStack(0, itemStack.split(1)); - if (!(this instanceof InfusionPedestal)) { - activate(world, pos, player, hit); - } + activate(world, pos, player, hit); return ActionResult.SUCCESS; } else { ItemStack itemStack = pedestal.getStack(0); @@ -130,7 +128,7 @@ public class PedestalBlock extends BlockBaseNotFull implements BlockEntityProvid return ActionResult.PASS; } - private void activate(World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { + protected void activate(World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { Mutable mut = new Mutable(); Point[] points = InfusionRitual.getMap(); for (Point p: points) {