aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLulonaut <lulonaut@lulonaut.dev>2024-04-10 14:56:28 +0200
committerGitHub <noreply@github.com>2024-04-10 14:56:28 +0200
commit9a3155634c0b6e732f174b544cc34d4d1acc7394 (patch)
tree0310ab894e1d9332cea49960b5620fe6fbcbd961
parent5384d0bc1028b46d4ab1ace9608b2b72b5068255 (diff)
downloadNotEnoughUpdates-9a3155634c0b6e732f174b544cc34d4d1acc7394.tar.gz
NotEnoughUpdates-9a3155634c0b6e732f174b544cc34d4d1acc7394.tar.bz2
NotEnoughUpdates-9a3155634c0b6e732f174b544cc34d4d1acc7394.zip
Add glacite powder to mining overlay (#1078)
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/Mining.java5
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java12
2 files changed, 13 insertions, 4 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/Mining.java b/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/Mining.java
index 38aefcaf..b485535e 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/Mining.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/Mining.java
@@ -156,11 +156,12 @@ public class Mining {
"§3Forge 1) §9Diamonite§7: §aReady!",
"§3Pickaxe CD: §a78s",
"§3Star Cult: §a78s",
- "§3Sky Mall: §a5x Titanium (78s)"
+ "§3Sky Mall: §a5x Titanium (78s)",
+ "§3Glacite Powder: §b46"
}
)
@ConfigAccordionId(id = 2)
- public List<Integer> dwarvenText2 = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5, 6));
+ public List<Integer> dwarvenText2 = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7));
@Expose
public Position overlayPosition = new Position(10, 100);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
index f2d2886d..64d49304 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
@@ -256,11 +256,13 @@ public class MiningOverlay extends TextTabOverlay {
// These strings will be displayed one after the other when the player list is disabled
String mithrilPowder = "";
String gemstonePowder = "";
+ String glacitePowder = "";
int forgeInt = 0;
List<String> powderLines = getTabLinesOrAddWarning(1, TablistAPI.WidgetNames.POWDER);
getTabLinesOrAddWarning(2, TablistAPI.WidgetNames.POWDER);
+ getTabLinesOrAddWarning(6, TablistAPI.WidgetNames.POWDER);
for (String line : powderLines) {
if (line.contains("Mithril:")) {
@@ -269,6 +271,9 @@ public class MiningOverlay extends TextTabOverlay {
if (line.contains("Gemstone:")) {
gemstonePowder = DARK_AQUA + Utils.trimWhitespaceAndFormatCodes(line).replaceAll("\u00a7[f|F|r]", "");
}
+ if (line.contains("Glacite: ")) {
+ glacitePowder = DARK_AQUA + Utils.trimWhitespaceAndFormatCodes(line).replaceAll("\u00a7[f|F|r]", "");
+ }
}
List<String> tabForgeLines = getTabLinesOrAddWarning(3, TablistAPI.WidgetNames.FORGE);
@@ -431,6 +436,9 @@ public class MiningOverlay extends TextTabOverlay {
case 6:
overlayStrings.add("§3Sky Mall: §a" + SkyMallDisplay.Companion.getDisplayText());
break;
+ case 7:
+ overlayStrings.add(glacitePowder);
+ break;
}
}
} else {
@@ -755,8 +763,6 @@ public class MiningOverlay extends TextTabOverlay {
} else {
if (beforeColon.startsWith("Forge")) {
icon = miningOverlayCommissionItems.get("Forge");
- } else if (beforeColon.contains("Mithril")) {
- icon = miningOverlayCommissionItems.get("Mithril");
} else if (beforeColon.endsWith(" Gemstone Collector")) {
String gemName = "ROUGH_"
+ beforeColon.replace(" Gemstone Collector", "").toUpperCase() + "_GEM";
@@ -832,6 +838,8 @@ public class MiningOverlay extends TextTabOverlay {
addItem("Chest Looter", "CHEST");
addItem("Titanium", "TITANIUM_ORE");
addItem("Mithril", "MITHRIL_ORE");
+ addItem("Gemstone", "ROCK_GEMSTONE");
+ addItem("Glacite", "GLACITE");
addItem("Forge", "ANVIL");
addItem("First Event", "FIREWORK");
}