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

Remove dodgy charges variable from item charges plugin

Browse Source 
Just use config class directly, this variable makes no sense.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2019-02-17 20:31:29 +01:00
committed by Hydrox6
parent 06d4adc5e4
commit ac8f728d47
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
View File

@@ -83,7 +83,7 @@ class ItemChargeOverlay extends Overlay
continue; continue;
} }
charges = itemChargePlugin.getDodgyCharges(); charges = config.dodgyNecklace();
} }
else else
{ {

17
runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
View File

@@ -28,8 +28,6 @@ import com.google.inject.Provides;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.client.Notifier; import net.runelite.client.Notifier;
@@ -68,9 +66,6 @@ public class ItemChargePlugin extends Plugin
@Inject @Inject
private ItemChargeConfig config; private ItemChargeConfig config;
@Getter(AccessLevel.PACKAGE)
private int dodgyCharges;
@Provides @Provides
ItemChargeConfig getConfig(ConfigManager configManager) ItemChargeConfig getConfig(ConfigManager configManager)
{ {
@@ -81,7 +76,6 @@ public class ItemChargePlugin extends Plugin
protected void startUp() protected void startUp()
{ {
overlayManager.add(overlay); overlayManager.add(overlay);
dodgyCharges = config.dodgyNecklace();
} }
@Override @Override
@@ -110,22 +104,21 @@ public class ItemChargePlugin extends Plugin
notifier.notify("Your dodgy necklace has crumbled to dust."); notifier.notify("Your dodgy necklace has crumbled to dust.");
} }
setDodgyCharges(MAX_DODGY_CHARGES); updateDodgyNecklaceCharges(MAX_DODGY_CHARGES);
} }
else if (dodgyCheckMatcher.find()) else if (dodgyCheckMatcher.find())
{ {
setDodgyCharges(Integer.parseInt(dodgyCheckMatcher.group(1))); updateDodgyNecklaceCharges(Integer.parseInt(dodgyCheckMatcher.group(1)));
} }
else if (dodgyProtectMatcher.find()) else if (dodgyProtectMatcher.find())
{ {
setDodgyCharges(Integer.parseInt(dodgyProtectMatcher.group(1))); updateDodgyNecklaceCharges(Integer.parseInt(dodgyProtectMatcher.group(1)));
} }
} }
} }
private void setDodgyCharges(int dodgyCharges) private void updateDodgyNecklaceCharges(final int value)
{ {
this.dodgyCharges = dodgyCharges; config.dodgyNecklace(value);
config.dodgyNecklace(dodgyCharges);
} }
} }

16
runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java
View File

@@ -33,11 +33,13 @@ import net.runelite.api.Client;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.client.Notifier; import net.runelite.client.Notifier;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayManager;
import static org.junit.Assert.assertEquals;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import static org.mockito.Matchers.eq;
import org.mockito.Mock; import org.mockito.Mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.runners.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
@@ -78,18 +80,22 @@ public class ItemChargePluginTest
{ {
ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", CHECK, "", 0); ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", CHECK, "", 0);
itemChargePlugin.onChatMessage(chatMessage); itemChargePlugin.onChatMessage(chatMessage);
assertEquals(10, itemChargePlugin.getDodgyCharges()); verify(config).dodgyNecklace(eq(10));
reset(config);
chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", PROTECT, "", 0); chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", PROTECT, "", 0);
itemChargePlugin.onChatMessage(chatMessage); itemChargePlugin.onChatMessage(chatMessage);
assertEquals(9, itemChargePlugin.getDodgyCharges()); verify(config).dodgyNecklace(eq(9));
reset(config);
chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", PROTECT_1, "", 0); chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", PROTECT_1, "", 0);
itemChargePlugin.onChatMessage(chatMessage); itemChargePlugin.onChatMessage(chatMessage);
assertEquals(1, itemChargePlugin.getDodgyCharges()); verify(config).dodgyNecklace(eq(1));
reset(config);
chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", BREAK, "", 0); chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", BREAK, "", 0);
itemChargePlugin.onChatMessage(chatMessage); itemChargePlugin.onChatMessage(chatMessage);
assertEquals(10, itemChargePlugin.getDodgyCharges()); verify(config).dodgyNecklace(eq(10));
reset(config);
} }
} }