aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io
diff options
context:
space:
mode:
authorNopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>2022-06-12 08:27:35 +0000
committerGitHub <noreply@github.com>2022-06-12 10:27:35 +0200
commitb3af4c172b10ea6fa77b098f59734c3a1a9029a8 (patch)
tree300f9e0a60c1565c81afc8998728e8501e1f2e32 /src/main/java/io
parentc8500921b28240f6fdae902a5efe8d81ca916d9f (diff)
downloadNotEnoughUpdates-b3af4c172b10ea6fa77b098f59734c3a1a9029a8.tar.gz
NotEnoughUpdates-b3af4c172b10ea6fa77b098f59734c3a1a9029a8.tar.bz2
NotEnoughUpdates-b3af4c172b10ea6fa77b098f59734c3a1a9029a8.zip
fixed skill avg (#165)
* :clueless: surely social2 level should be part of skill avg * rename equipment hud
Diffstat (limited to 'src/main/java/io')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java1
3 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
index 237a76ca..e1848382 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -336,8 +336,8 @@ public class NEUConfig extends Config {
@Expose
@Category(
- name = "Custom Armour Hud",
- desc = "Custom Armour Hud"
+ name = "Equipment Hud",
+ desc = "Equipment Hud"
)
public CustomArmour customArmour = new CustomArmour();
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
index 60d8e5ef..6c47b7a6 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
@@ -28,7 +28,7 @@ public class CustomArmour {
@Expose
@ConfigOption(
- name = "Enable Custom Armour Hud",
+ name = "Enable Equipment Hud",
desc = "Shows an overlay in your inventory showing your 4 extra armour slots"
)
@ConfigEditorBoolean
@@ -36,7 +36,7 @@ public class CustomArmour {
@Expose
@ConfigOption(
- name = "Click To Open equipment menu",
+ name = "Click To Open Equipment Menu",
desc = "Click on the hud to open /equipment"
)
@ConfigEditorBoolean
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
index 3f131465..40445298 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
@@ -3264,6 +3264,7 @@ public class GuiProfileViewer extends GuiScreen {
if (entry.getKey().contains("runecrafting")) continue;
if (entry.getKey().contains("carpentry")) continue;
if (entry.getKey().contains("catacombs")) continue;
+ if (entry.getKey().contains("social")) continue;
totalSkillLVL += entry.getValue().getAsFloat();
totalTrueSkillLVL += Math.floor(entry.getValue().getAsFloat());