Fixes #4753: Use the vanilla helper for SUCCESS or CONSUME #5072
Conversation
This makes now use of the vanilla helper to return `SUCCESS` or `CONSUME` depending on the side. Also some general cleanup like unused imports, missing file headers, etc
| @@ -47,11 +46,11 @@ public ActionResultType onActivated(final World w, final BlockPos pos, final Pla | |||
| final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { | |||
| final GrinderTileEntity tg = this.getTileEntity(w, pos); | |||
| if (tg != null && !InteractionUtil.isInAlternateUseMode(p)) { | |||
| if (p instanceof ServerPlayerEntity) { | |||
There was a problem hiding this comment.
is p nullable and this elides a null-check? I don't remember
There was a problem hiding this comment.
InteractionUtil.isInAlternateUseMode(p) guards against it by throwing a NPE before it even reaches the instanceof.
But otherwise no idea. Looks like an outlier. There is also no special handler here for fakeplayers, that is just for the crank.
Otherwise anything else follows the pattern with getTile && !isRemote
| @@ -333,6 +333,8 @@ public void registerCraftingSimulation(final World world, final CraftingJob craf | |||
|
|
|||
| /** | |||
| * Simulates the current crafting requests before they user can submit them to be processed. | |||
| * | |||
| * @param world | |||
There was a problem hiding this comment.
I think we're just turning in circles .I remove them, you add them back :-D
| if (block instanceof AEBaseBlock) { | ||
| if (Platform.isClient()) { | ||
| if (w.isRemote()) { | ||
| // TODO 1.10-R - if we return FAIL on client, action will not be sent to server. |
| context.getPlayer().swingArm(context.getHand()); | ||
| return !context.getWorld().isRemote ? ActionResultType.SUCCESS : ActionResultType.FAIL; | ||
| if (aeBlock.rotateAroundFaceAxis(w, pos, context.getFace())) { | ||
| p.swingArm(context.getHand()); |
There was a problem hiding this comment.
This seems hyper-fishy.... Is this because we're in onitemusefirst?
There was a problem hiding this comment.
No idea and I do not really want to touch it currently.
|
There are a couple things overall missing.
|
This makes now use of the vanilla helper to return
SUCCESSorCONSUMEdepending on the side.Also some general cleanup like unused imports, missing file headers, etc