From 6428a7af4ff94e16e22c58c65ef4a4c93d793e98 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 9 Sep 2021 22:41:43 -0700 Subject: [PATCH] skill calculator: Code cleanup --- .../skillcalculator/SkillCalculator.java | 30 ++++++++++--------- .../skillcalculator/SkillCalculatorPanel.java | 1 - .../SkillCalculatorPlugin.java | 1 - .../plugins/skillcalculator/UIActionSlot.java | 3 +- .../skillcalculator/UICombinedActionSlot.java | 1 - 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index bd688d3788..6a756431d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2018, Kruithne * Copyright (c) 2018, Psikoi * All rights reserved. @@ -81,7 +81,7 @@ class SkillCalculator extends JPanel private int currentXP = Experience.getXpForLevel(currentLevel); private int targetLevel = currentLevel + 1; private int targetXP = Experience.getXpForLevel(targetLevel); - private float xpFactor = 1.0f; + private float xpFactor = 1; SkillCalculator(Client client, UICalculatorInputArea uiInput, SpriteManager spriteManager, ItemManager itemManager) { @@ -145,7 +145,7 @@ class SkillCalculator extends JPanel skillData = cacheSkillData.getSkillData(calculatorType.getDataFile()); // Reset the XP factor, removing bonuses. - xpFactor = 1.0f; + xpFactor = 1; VarPlayer endGoalVarp = endGoalVarpForSkill(calculatorType.getSkill()); int endGoal = client.getVar(endGoalVarp); @@ -234,15 +234,17 @@ class SkillCalculator extends JPanel private void renderBonusOptions() { - if (skillData.getBonuses() != null) + if (skillData.getBonuses() == null) { - for (SkillDataBonus bonus : skillData.getBonuses()) - { - JPanel checkboxPanel = buildCheckboxPanel(bonus); + return; + } - add(checkboxPanel); - add(Box.createRigidArea(new Dimension(0, 5))); - } + for (SkillDataBonus bonus : skillData.getBonuses()) + { + JPanel checkboxPanel = buildCheckboxPanel(bonus); + + add(checkboxPanel); + add(Box.createRigidArea(new Dimension(0, 5))); } } @@ -363,7 +365,7 @@ class SkillCalculator extends JPanel updateCombinedAction(); } - private String formatXPActionString(double xp, int actionCount, String expExpression) + private static String formatXPActionString(double xp, int actionCount, String expExpression) { return XP_FORMAT.format(xp) + expExpression + NumberFormat.getIntegerInstance().format(actionCount) + (actionCount > 1 ? " actions" : " action"); } @@ -389,7 +391,7 @@ class SkillCalculator extends JPanel private void adjustXPBonus(float value) { - xpFactor = 1f + value; + xpFactor = 1 + value; calculate(); } @@ -449,12 +451,12 @@ class SkillCalculator extends JPanel }); } - private boolean slotContainsText(UIActionSlot slot, String text) + private static boolean slotContainsText(UIActionSlot slot, String text) { return slot.getAction().getName().toLowerCase().contains(text.toLowerCase()); } - private FocusAdapter buildFocusAdapter(Consumer focusLostConsumer) + private static FocusAdapter buildFocusAdapter(Consumer focusLostConsumer) { return new FocusAdapter() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java index b6abe4577f..6c2f97f57c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java @@ -23,7 +23,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - package net.runelite.client.plugins.skillcalculator; import java.awt.GridBagConstraints; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java index 8999d2ad00..b62f688576 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java @@ -22,7 +22,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - package net.runelite.client.plugins.skillcalculator; import java.awt.image.BufferedImage; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java index 2051a0ddcd..3d9124136a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java @@ -23,7 +23,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - package net.runelite.client.plugins.skillcalculator; import java.awt.BorderLayout; @@ -80,7 +79,7 @@ class UIActionSlot extends JPanel @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) - private double value = 0; + private double value; UIActionSlot(SkillDataEntry action, JLabel uiIcon) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java index fa1614c91b..46aea10dff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java @@ -23,7 +23,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - package net.runelite.client.plugins.skillcalculator; import java.awt.BorderLayout;