diff options
Diffstat (limited to 'src/main')
4 files changed, 33 insertions, 33 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java index e56da32f..d2bfdbd9 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java @@ -65,9 +65,9 @@ public class MiscOverlays { "\u00a73Fetchur: \u00a7e3h38m", "\u00a73Commissions: \u00a7e3h38m", "\u00a73Experiments: \u00a7e3h38m", - "\u00a73Daily Mithril Powder: \u00a7e3h38m", - "\u00a73Daily Gemstone Powder: \u00a7e3h38m", - "\u00a73Daily Heavy Pearls: \u00a7e3h38m", + "\u00a73Mithril Powder: \u00a7e3h38m", + "\u00a73Gemstone Powder: \u00a7e3h38m", + "\u00a73Heavy Pearls: \u00a7e3h38m", } ) @ConfigAccordionId(id = 0) @@ -167,8 +167,8 @@ public class MiscOverlays { @Expose @ConfigOption( - name = "Daily Mithril Powder Display", - desc = "Change the way the daily mithril powder displays\n" + + name = "Mithril Powder Display", + desc = "Change the way the mithril powder displays\n" + "Only when ready, When very Soon, When soon, When kinda soon or always." ) @ConfigAccordionId(id = 1) @@ -179,8 +179,8 @@ public class MiscOverlays { @Expose @ConfigOption( - name = "Daily Gemstone Powder Display", - desc = "Change the way the daily gemstone powder displays\n" + + name = "Gemstone Powder Display", + desc = "Change the way the gemstone powder displays\n" + "Only when ready, When very Soon, When soon, When kinda soon or always." ) @ConfigAccordionId(id = 1) @@ -191,8 +191,8 @@ public class MiscOverlays { @Expose @ConfigOption( - name = "Daily Heavy Pearl Display", - desc = "Change the way the daily heavy pearl displays\n" + + name = "Heavy Pearl Display", + desc = "Change the way the heavy pearl displays\n" + "Only when ready, When very Soon, When soon, When kinda soon or always." ) @ConfigAccordionId(id = 1) diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Notifications.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Notifications.java index e25a535f..98d429d0 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Notifications.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Notifications.java @@ -45,7 +45,7 @@ public class Notifications { @Expose @ConfigOption( - name = "OldAnimations warning", + name = "OldAnimations Warning", desc = "Warning when an unsupported OldAnimations mod is used" ) @ConfigEditorBoolean @@ -53,7 +53,7 @@ public class Notifications { @Expose @ConfigOption( - name = "Fast Render warning", + name = "Fast Render Warning", desc = "\u00a7cIf and ONLY if you have Fast Render disabled and are still seeing the warning, you can disable it here.\nDisabling it with Fast Render still on will lead to broken features." ) @ConfigEditorBoolean diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java index c1a1c848..d73c71dc 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java @@ -50,8 +50,8 @@ public class OverlayManager { "\u00a73Fetchur: \u00a7eReady!", "\u00a73Commissions: \u00a7eReady!", "\u00a73Experiments: \u00a7eReady!", - "\u00a73Daily Mithril Powder: \u00a7eReady", - "\u00a73Daily Gemstone Powder: \u00a7eReady", + "\u00a73Mithril Powder: \u00a7eReady", + "\u00a73Gemstone Powder: \u00a7eReady", "\u00a73Cakes: \u00a7e1d21h", "\u00a73Cookie Buff: \u00a7e2d23h", "\u00a73Godpot: \u00a7e19h", @@ -59,8 +59,8 @@ public class OverlayManager { "\u00a73Fetchur: \u00a7e3h38m", "\u00a73Commissions: \u00a7e3h38m", "\u00a73Experiments: \u00a7e3h38m", - "\u00a73Daily Mithril Powder: \u00a7e3h38m", - "\u00a73Daily Gemstone Powder: \u00a7e3h38m" + "\u00a73Mithril Powder: \u00a7e3h38m", + "\u00a73Gemstone Powder: \u00a7e3h38m" ); textOverlays.add( timersOverlay = new TimersOverlay(NotEnoughUpdates.INSTANCE.config.miscOverlays.todoPosition, () -> { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java index 411a56d8..d5d8afd7 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java @@ -196,17 +196,17 @@ public class TimersOverlay extends TextOverlay { case "Cookie Buff": icon = COOKIE_ICON; break; - case "Daily Mithril Powder": + case "Mithril Powder": icon = NotEnoughUpdates.INSTANCE.manager.jsonToStack(NotEnoughUpdates.INSTANCE.manager .getItemInformation() .get("MITHRIL_ORE")); break; - case "Daily Gemstone Powder": + case "Gemstone Powder": icon = NotEnoughUpdates.INSTANCE.manager.jsonToStack(NotEnoughUpdates.INSTANCE.manager .getItemInformation() .get("PERFECT_AMETHYST_GEM")); break; - case "Daily Heavy Pearls": + case "Heavy Pearls": icon = NotEnoughUpdates.INSTANCE.manager.jsonToStack(NotEnoughUpdates.INSTANCE.manager .getItemInformation() .get("HEAVY_PEARL")); @@ -687,7 +687,7 @@ public class TimersOverlay extends TextOverlay { if (hidden.dailyMithrilPowerCompleted < midnightReset) { map.put( 7, - DARK_AQUA + "Daily Mithril Powder: " + + DARK_AQUA + "Mithril Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.readyColour] + "Ready!" ); } else if ( @@ -695,7 +695,7 @@ public class TimersOverlay extends TextOverlay { (hidden.dailyMithrilPowerCompleted < (midnightReset - TimeEnums.HALFANHOUR.time))) { map.put( 7, - DARK_AQUA + "Daily Mithril Powder: " + + DARK_AQUA + "Mithril Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.verySoonColour] + Utils.prettyTime(timeDiffMidnightNow) ); @@ -703,7 +703,7 @@ public class TimersOverlay extends TextOverlay { (hidden.dailyMithrilPowerCompleted < (midnightReset - TimeEnums.HOUR.time))) { map.put( 7, - DARK_AQUA + "Daily Mithril Powder: " + + DARK_AQUA + "Mithril Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.soonColour] + Utils.prettyTime(timeDiffMidnightNow) ); @@ -712,7 +712,7 @@ public class TimersOverlay extends TextOverlay { (hidden.dailyMithrilPowerCompleted < (midnightReset - (TimeEnums.HOUR.time * 3)))) { map.put( 7, - DARK_AQUA + "Daily Mithril Powder: " + + DARK_AQUA + "Mithril Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.kindaSoonColour] + Utils.prettyTime(timeDiffMidnightNow) ); @@ -720,7 +720,7 @@ public class TimersOverlay extends TextOverlay { DISPLAYTYPE.ALWAYS.ordinal()) { map.put( 7, - DARK_AQUA + "Daily Mithril Powder: " + + DARK_AQUA + "Mithril Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.defaultColour] + Utils.prettyTime(timeDiffMidnightNow) ); @@ -730,7 +730,7 @@ public class TimersOverlay extends TextOverlay { if (hidden.dailyGemstonePowderCompleted < midnightReset) { map.put( 8, - DARK_AQUA + "Daily Gemstone Powder: " + + DARK_AQUA + "Gemstone Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.readyColour] + "Ready!" ); } else if ( @@ -738,7 +738,7 @@ public class TimersOverlay extends TextOverlay { (hidden.dailyGemstonePowderCompleted < (midnightReset - TimeEnums.HALFANHOUR.time))) { map.put( 8, - DARK_AQUA + "Daily Gemstone Powder: " + + DARK_AQUA + "Gemstone Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.verySoonColour] + Utils.prettyTime(timeDiffMidnightNow) ); @@ -746,7 +746,7 @@ public class TimersOverlay extends TextOverlay { (hidden.dailyGemstonePowderCompleted < (midnightReset - TimeEnums.HOUR.time))) { map.put( 8, - DARK_AQUA + "Daily Gemstone Powder: " + + DARK_AQUA + "Gemstone Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.soonColour] + Utils.prettyTime(timeDiffMidnightNow) ); @@ -755,7 +755,7 @@ public class TimersOverlay extends TextOverlay { (hidden.dailyGemstonePowderCompleted < (midnightReset - (TimeEnums.HOUR.time * 3)))) { map.put( 8, - DARK_AQUA + "Daily Gemstone Powder: " + + DARK_AQUA + "Gemstone Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.kindaSoonColour] + Utils.prettyTime(timeDiffMidnightNow) ); @@ -763,7 +763,7 @@ public class TimersOverlay extends TextOverlay { DISPLAYTYPE.ALWAYS.ordinal()) { map.put( 8, - DARK_AQUA + "Daily Gemstone Powder: " + + DARK_AQUA + "Gemstone Powder: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.defaultColour] + Utils.prettyTime(timeDiffMidnightNow) ); @@ -773,7 +773,7 @@ public class TimersOverlay extends TextOverlay { if (hidden.dailyHeavyPearlCompleted < pearlsReset) { map.put( 9, - DARK_AQUA + "Daily Heavy Pearls: " + + DARK_AQUA + "Heavy Pearls: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.readyColour] + "Ready!" ); } else if ( @@ -781,7 +781,7 @@ public class TimersOverlay extends TextOverlay { (hidden.dailyHeavyPearlCompleted < (pearlsReset - TimeEnums.HALFANHOUR.time))) { map.put( 9, - DARK_AQUA + "Daily Heavy Pearls: " + + DARK_AQUA + "Heavy Pearls: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.verySoonColour] + Utils.prettyTime(pearlsReset + 86400000 - currentTime) ); @@ -789,7 +789,7 @@ public class TimersOverlay extends TextOverlay { (hidden.dailyHeavyPearlCompleted < (pearlsReset - TimeEnums.HOUR.time))) { map.put( 9, - DARK_AQUA + "Daily Heavy Pearls: " + + DARK_AQUA + "Heavy Pearls: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.soonColour] + Utils.prettyTime(pearlsReset + 86400000 - currentTime) ); @@ -798,7 +798,7 @@ public class TimersOverlay extends TextOverlay { (hidden.dailyHeavyPearlCompleted < (pearlsReset - (TimeEnums.HOUR.time * 3)))) { map.put( 9, - DARK_AQUA + "Daily Heavy Pearls: " + + DARK_AQUA + "Heavy Pearls: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.kindaSoonColour] + Utils.prettyTime(pearlsReset + 86400000 - currentTime) ); @@ -806,7 +806,7 @@ public class TimersOverlay extends TextOverlay { DISPLAYTYPE.ALWAYS.ordinal()) { map.put( 9, - DARK_AQUA + "Daily Heavy Pearls: " + + DARK_AQUA + "Heavy Pearls: " + EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.defaultColour] + Utils.prettyTime(pearlsReset + 86400000 - currentTime) ); |