From 271bb0165ec0162e56dac63868f1d59066092289 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Fri, 28 Dec 2018 13:16:58 -0500 Subject: [PATCH] Remove unnecessary state parameters --- .../simplemultipart/multipart/Multipart.java | 10 ++++------ .../simplemultipart/multipart/MultipartState.java | 8 ++++---- .../simplemultipart/test/EntityTestPart.java | 2 +- .../simplemultipart/test/TestMultipart.java | 4 ++-- .../simplemultipart/test/TickableEntityTestPart.java | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/shadowfacts/simplemultipart/multipart/Multipart.java b/src/main/java/net/shadowfacts/simplemultipart/multipart/Multipart.java index 3b2da31..b3c0541 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/multipart/Multipart.java +++ b/src/main/java/net/shadowfacts/simplemultipart/multipart/Multipart.java @@ -96,7 +96,7 @@ public abstract class Multipart { public abstract VoxelShape getBoundingShape(MultipartState state, /*@Nullable*/ MultipartView view); /** - * @return The loot table ID used for to determine the drops by the default {@link Multipart#getDroppedStacks(MultipartState, MultipartView, LootContext.Builder)} implementation. + * @return The loot table ID used for to determine the drops by the default {@link Multipart#getDroppedStacks(MultipartView, LootContext.Builder)} implementation. */ public Identifier getDropTableId() { if (dropTableId == null) { @@ -111,18 +111,17 @@ public abstract class Multipart { * * Can be overridden, should only be called via {@link MultipartState#getDroppedStacks)} * - * @param state The state of this part. * @param view The view of this part. * @param builder The {@link LootContext} builder, used by the default loot table-based implementation. * @return The list of stacks to drop. */ @Deprecated - public List getDroppedStacks(MultipartState state, MultipartView view, LootContext.Builder builder) { + public List getDroppedStacks(MultipartView view, LootContext.Builder builder) { Identifier dropTableId = getDropTableId(); if (dropTableId == LootTables.EMPTY) { return ImmutableList.of(); } else { - LootContext context = builder.put(SimpleMultipart.MULTIPART_STATE_PARAMETER, state).build(SimpleMultipart.MULTIPART_LOOT_CONTEXT); + LootContext context = builder.put(SimpleMultipart.MULTIPART_STATE_PARAMETER, view.getState()).build(SimpleMultipart.MULTIPART_LOOT_CONTEXT); ServerWorld world = context.getWorld(); LootSupplier supplier = world.getServer().getLootManager().getSupplier(dropTableId); return supplier.getDrops(context); @@ -134,14 +133,13 @@ public abstract class Multipart { * * Can be overridden, should only be called via {@link MultipartState#activate} * - * @param state The state of this part. * @param view The view of this part. * @param player The player that activated this part. * @param hand The hand with which they performed the action. * @return If the activation was successful. {@code true} will trigger the hand-swinging animation. */ @Deprecated - public boolean activate(MultipartState state, MultipartView view, PlayerEntity player, Hand hand) { + public boolean activate(MultipartView view, PlayerEntity player, Hand hand) { return false; } diff --git a/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartState.java b/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartState.java index 41fc36a..679771a 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartState.java +++ b/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartState.java @@ -41,19 +41,19 @@ public class MultipartState extends AbstractPropertyContainer getDroppedStacks(MultipartView view, LootContext.Builder builder) { //noinspection deprecated - return owner.getDroppedStacks(this, view, builder); + return owner.getDroppedStacks(view, builder); } /** - * @see Multipart#activate(MultipartState, MultipartView, PlayerEntity, Hand) + * @see Multipart#activate(MultipartView, PlayerEntity, Hand) */ public boolean activate(MultipartView view, PlayerEntity player, Hand hand) { //noinspection deprecated - return owner.activate(this, view, player, hand); + return owner.activate(view, player, hand); } } diff --git a/src/test/java/net/shadowfacts/simplemultipart/test/EntityTestPart.java b/src/test/java/net/shadowfacts/simplemultipart/test/EntityTestPart.java index 7168acc..08a7f4d 100644 --- a/src/test/java/net/shadowfacts/simplemultipart/test/EntityTestPart.java +++ b/src/test/java/net/shadowfacts/simplemultipart/test/EntityTestPart.java @@ -27,7 +27,7 @@ public class EntityTestPart extends Multipart implements MultipartEntityProvider @Override @Deprecated - public boolean activate(MultipartState state, MultipartView view, PlayerEntity player, Hand hand) { + public boolean activate(MultipartView view, PlayerEntity player, Hand hand) { BlockPos pos = ((Entity)view.getEntity()).getPos(); player.addChatMessage(new StringTextComponent("Clicked: " + pos), false); return true; diff --git a/src/test/java/net/shadowfacts/simplemultipart/test/TestMultipart.java b/src/test/java/net/shadowfacts/simplemultipart/test/TestMultipart.java index 3f65e5e..340a0f3 100644 --- a/src/test/java/net/shadowfacts/simplemultipart/test/TestMultipart.java +++ b/src/test/java/net/shadowfacts/simplemultipart/test/TestMultipart.java @@ -56,8 +56,8 @@ public class TestMultipart extends Multipart { @Override @Deprecated - public boolean activate(MultipartState state, MultipartView view, PlayerEntity player, Hand hand) { - Direction side = state.get(Properties.FACING); + public boolean activate(MultipartView view, PlayerEntity player, Hand hand) { + Direction side = view.getState().get(Properties.FACING); System.out.println("part activated on " + side); return true; } diff --git a/src/test/java/net/shadowfacts/simplemultipart/test/TickableEntityTestPart.java b/src/test/java/net/shadowfacts/simplemultipart/test/TickableEntityTestPart.java index e315f6c..1e1b44b 100644 --- a/src/test/java/net/shadowfacts/simplemultipart/test/TickableEntityTestPart.java +++ b/src/test/java/net/shadowfacts/simplemultipart/test/TickableEntityTestPart.java @@ -26,7 +26,7 @@ public class TickableEntityTestPart extends Multipart implements MultipartEntity @Override @Deprecated - public boolean activate(MultipartState state, MultipartView view, PlayerEntity player, Hand hand) { + public boolean activate(MultipartView view, PlayerEntity player, Hand hand) { int timer = ((Entity)view.getEntity()).timer; player.addChatMessage(new StringTextComponent("Timer: " + timer), false); return true;