ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1549 from Kamielvf/ge-sell-buy-cancelled

Browse Source 
Show grand exchange offer type on cancelled state
This commit is contained in:
Adam
2018-04-16 22:17:57 -04:00
committed by GitHub
parent 50dbcd73d7 8d1945e9a0
commit c95f788c26
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-api/src/main/java/net/runelite/api/GrandExchangeOfferState.java
View File

@@ -35,9 +35,13 @@ public enum GrandExchangeOfferState
*/ */
EMPTY, EMPTY,
/** /**
* Any offer that's been cancelled * A cancelled buy offer
*/ */
CANCELLED, CANCELLED_BUY,
/**
* A cancelled sell offer
*/
CANCELLED_SELL,
/** /**
* A buy offer that is currently in progress. * A buy offer that is currently in progress.
*/ */

9
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
View File

@@ -151,8 +151,10 @@ public class GrandExchangeOfferSlot extends JPanel
{ {
switch (state) switch (state)
{ {
case CANCELLED: case CANCELLED_BUY:
return "Cancelled"; return "Buying cancelled";
case CANCELLED_SELL:
return "Selling cancelled";
case BUYING: case BUYING:
return "Buying"; return "Buying";
case BOUGHT: case BOUGHT:
@@ -172,7 +174,8 @@ public class GrandExchangeOfferSlot extends JPanel
{ {
switch (state) switch (state)
{ {
case CANCELLED: case CANCELLED_BUY:
case CANCELLED_SELL:
return GE_CANCELLED_RED; return GE_CANCELLED_RED;
case BUYING: case BUYING:
case SELLING: case SELLING:

2
runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlotTest.java
View File

@@ -45,7 +45,7 @@ public class GrandExchangeOfferSlotTest
@Test @Test
public void testUpdateOffer() public void testUpdateOffer()
{ {
when(offer.getState()).thenReturn(GrandExchangeOfferState.CANCELLED); when(offer.getState()).thenReturn(GrandExchangeOfferState.CANCELLED_BUY);
GrandExchangeOfferSlot offerSlot = new GrandExchangeOfferSlot(); GrandExchangeOfferSlot offerSlot = new GrandExchangeOfferSlot();
offerSlot.updateOffer(mock(ItemComposition.class), mock(BufferedImage.class), offer); offerSlot.updateOffer(mock(ItemComposition.class), mock(BufferedImage.class), offer);

5
runelite-mixins/src/main/java/net/runelite/mixins/RSGrandExchangeOfferMixin.java
View File

@@ -28,7 +28,8 @@ package net.runelite.mixins;
import net.runelite.api.GrandExchangeOfferState; import net.runelite.api.GrandExchangeOfferState;
import static net.runelite.api.GrandExchangeOfferState.BOUGHT; import static net.runelite.api.GrandExchangeOfferState.BOUGHT;
import static net.runelite.api.GrandExchangeOfferState.BUYING; import static net.runelite.api.GrandExchangeOfferState.BUYING;
import static net.runelite.api.GrandExchangeOfferState.CANCELLED; import static net.runelite.api.GrandExchangeOfferState.CANCELLED_BUY;
import static net.runelite.api.GrandExchangeOfferState.CANCELLED_SELL;
import static net.runelite.api.GrandExchangeOfferState.EMPTY; import static net.runelite.api.GrandExchangeOfferState.EMPTY;
import static net.runelite.api.GrandExchangeOfferState.SELLING; import static net.runelite.api.GrandExchangeOfferState.SELLING;
import static net.runelite.api.GrandExchangeOfferState.SOLD; import static net.runelite.api.GrandExchangeOfferState.SOLD;
@@ -79,7 +80,7 @@ public abstract class RSGrandExchangeOfferMixin implements RSGrandExchangeOffer
} }
else if (isFinished && getQuantitySold() < getTotalQuantity()) else if (isFinished && getQuantitySold() < getTotalQuantity())
{ {
return CANCELLED; return isSelling ? CANCELLED_SELL : CANCELLED_BUY;
} }
else if (isSelling) else if (isSelling)
{ {