Odd animation breaking #2690

Merged
merged 2 commits into from Dec 8, 2016

Projects

None yet

3 participants

@dshadowwolf
Contributor

This is a simple fix for the Wireless Terminal and Portable Cell to stop them from doing the re-equip animation when in use.

@dshadowwolf dshadowwolf Fix for portable cell and wireless terminal going into re-equip anima…
…tions when GUI is open.
664bcc4
@@ -186,4 +186,9 @@ public IGuiItemObject getGuiObject( final ItemStack is, final World w, final Blo
{
return new PortableCellViewer( is, pos.getX() );
}
+
+ @Override
+ public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) {
@dshadowwolf
dshadowwolf Dec 8, 2016 Contributor

Will make the changes, thanks for the review. Tossed this together quick after noticing the issue and figuring fixing it myself would be faster than opening a new issue, just forgot code style. I'll get on that.

@dshadowwolf dshadowwolf Code style fixes for previous pull request that were suggested by
the orod-org code review bot. I would try and do some work to merge the
two commits together, but feel that might muddy the waters a bit.
ccbea42
@orod-org
orod-org commented Dec 8, 2016

SonarQube analysis reported 2 issues

Note: The following issues were found on lines that were not modified in the pull request. Because these issues can't be reported as line comments, they are summarized here:

  1. MAJOR ToolPortableCell.java#L93: Method appeng.items.tools.powered.ToolPortableCell.addCheckedInformation(ItemStack, EntityPlayer, List, boolean) appears to call the same method on the same object redundantly rule
  2. MAJOR ToolWirelessTerminal.java#L121: Make this anonymous inner class a lambda rule
@yueh
Member
yueh commented Dec 8, 2016

Oh thanks. I always wondered about that behaviour and what minecraft/forge broke to accomplish it. But was a bit too lazy to search for a solution as was not that important.

Issue would have probably be nice. I think there was like 1 or 2 other strange behaviours with other tools. But I might be totally wrong about it. Would just be a bit more likely to have someone other report it, should there be any.

@yueh yueh merged commit 6bf52b0 into AppliedEnergistics:master Dec 8, 2016

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins Success
Details
sonarqube SonarQube reported 2 issues, no criticals or blockers
@phit phit added a commit to Stonebound/Applied-Energistics-2 that referenced this pull request Dec 19, 2016
@dshadowwolf @phit dshadowwolf + phit Fixes constant reequip animation on portable cells/terminals (#2690)
Fix for portable cell and wireless terminal going into re-equip animations when GUI is open.
4dbc9c7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment