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

skill calculator: lombok some of UIActionSlot

Browse Source
This commit is contained in:
Adam
2018-05-27 16:36:17 -04:00
parent 21a9bd45f7
commit 4f129da698
2 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
View File

@@ -151,7 +151,7 @@ class SkillCalculator extends JPanel
double xp = 0; double xp = 0;
for (UIActionSlot slot : combinedActionSlots) for (UIActionSlot slot : combinedActionSlots)
xp += slot.value; xp += slot.getValue();
if (neededXP > 0) if (neededXP > 0)
actionCount = (int) Math.ceil(neededXP / xp); actionCount = (int) Math.ceil(neededXP / xp);
@@ -216,12 +216,12 @@ class SkillCalculator extends JPanel
if (!e.isShiftDown()) if (!e.isShiftDown())
clearCombinedSlots(); clearCombinedSlots();
if (slot.isSelected) if (slot.isSelected())
combinedActionSlots.remove(slot); combinedActionSlots.remove(slot);
else else
combinedActionSlots.add(slot); combinedActionSlots.add(slot);
slot.setSelected(!slot.isSelected); slot.setSelected(!slot.isSelected());
updateCombinedAction(); updateCombinedAction();
} }
}); });
@@ -238,14 +238,15 @@ class SkillCalculator extends JPanel
{ {
int actionCount = 0; int actionCount = 0;
int neededXP = targetXP - currentXP; int neededXP = targetXP - currentXP;
double xp = (slot.action.isIgnoreBonus()) ? slot.action.getXp() : slot.action.getXp() * xpFactor; SkillDataEntry action = slot.getAction();
double xp = (action.isIgnoreBonus()) ? action.getXp() : action.getXp() * xpFactor;
if (neededXP > 0) if (neededXP > 0)
actionCount = (int) Math.ceil(neededXP / xp); actionCount = (int) Math.ceil(neededXP / xp);
slot.setText("Lvl. " + slot.action.getLevel() + " (" + formatXPActionString(xp, actionCount, "exp) - ")); slot.setText("Lvl. " + action.getLevel() + " (" + formatXPActionString(xp, actionCount, "exp) - "));
slot.setAvailable(currentLevel >= slot.action.getLevel()); slot.setAvailable(currentLevel >= action.getLevel());
slot.value = xp; slot.setValue((int) xp);
} }
} }

41
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java
View File

@@ -39,6 +39,9 @@ import javax.swing.JPanel;
import javax.swing.border.Border; import javax.swing.border.Border;
import javax.swing.border.CompoundBorder; import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder; import javax.swing.border.EmptyBorder;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.runelite.client.plugins.skillcalculator.beans.SkillDataEntry; import net.runelite.client.plugins.skillcalculator.beans.SkillDataEntry;
import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.FontManager; import net.runelite.client.ui.FontManager;
@@ -54,15 +57,27 @@ class UIActionSlot extends JPanel
BorderFactory.createMatteBorder(0, 4, 0, 0, (ColorScheme.PROGRESS_ERROR_COLOR).darker()), BorderFactory.createMatteBorder(0, 4, 0, 0, (ColorScheme.PROGRESS_ERROR_COLOR).darker()),
BorderFactory.createEmptyBorder(7, 12, 7, 7)); BorderFactory.createEmptyBorder(7, 12, 7, 7));
SkillDataEntry action; private static final Border ORANGE_BORDER = new CompoundBorder(
private JShadowedLabel uiLabelActions; BorderFactory.createMatteBorder(0, 4, 0, 0, (ColorScheme.PROGRESS_INPROGRESS_COLOR).darker()),
BorderFactory.createEmptyBorder(7, 12, 7, 7));
private static final Dimension ICON_SIZE = new Dimension(32, 32); private static final Dimension ICON_SIZE = new Dimension(32, 32);
@Getter(AccessLevel.PACKAGE)
private final SkillDataEntry action;
private final JShadowedLabel uiLabelActions;
private final JPanel uiInfo; private final JPanel uiInfo;
boolean isAvailable = false; @Getter(AccessLevel.PACKAGE)
boolean isSelected = false; private boolean isAvailable;
double value = 0; @Getter(AccessLevel.PACKAGE)
private boolean isSelected;
@Getter(AccessLevel.PACKAGE)
@Setter(AccessLevel.PACKAGE)
private int value = 0;
UIActionSlot(SkillDataEntry action) UIActionSlot(SkillDataEntry action)
{ {
@@ -128,13 +143,13 @@ class UIActionSlot extends JPanel
void setSelected(boolean selected) void setSelected(boolean selected)
{ {
isSelected = selected; isSelected = selected;
updateBackground(); this.updateBackground();
} }
void setAvailable(boolean available) void setAvailable(boolean available)
{ {
isAvailable = available; isAvailable = available;
updateBackground(); this.updateBackground();
} }
void setText(String text) void setText(String text)
@@ -144,8 +159,16 @@ class UIActionSlot extends JPanel
private void updateBackground() private void updateBackground()
{ {
setBorder(isAvailable ? GREEN_BORDER : RED_BORDER); if (isAvailable)
setBackground(isSelected ? ColorScheme.DARKER_GRAY_HOVER_COLOR.brighter() : ColorScheme.DARKER_GRAY_COLOR); {
this.setBorder(GREEN_BORDER);
}
else
{
this.setBorder(RED_BORDER);
}
setBackground(this.isSelected() ? ColorScheme.DARKER_GRAY_HOVER_COLOR.brighter() : ColorScheme.DARKER_GRAY_COLOR);
} }
@Override @Override