aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/io')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java5
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java19
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java9
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java10
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlayerOverlay.java8
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/overlays/SlayerOverlay.java61
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java8
7 files changed, 91 insertions, 29 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
index 99e3fb04..43c6fa7f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
@@ -2474,6 +2474,9 @@ public class NEUEventListener {
ItemPriceInformation.addToTooltip(event.toolTip, internalname, event.itemStack);
}
+ if (event.itemStack.getTagCompound() != null && event.itemStack.getTagCompound().getBoolean("NEUHIDEPETTOOLTIP") && NotEnoughUpdates.INSTANCE.config.petOverlay.hidePetTooltip) {
+ event.toolTip.clear();
+ }
}
private final Pattern xpLevelPattern = Pattern.compile("(.*) (\\xA7e(.*)\\xA76/\\xA7e(.*))");
@@ -2577,7 +2580,7 @@ public class NEUEventListener {
public void onItemTooltip(ItemTooltipEvent event) {
if (!neu.isOnSkyblock()) return;
//Render the pet inventory display tooltip to the left to avoid things from other mods rendering over the tooltip
- if (event.itemStack.getTagCompound().getBoolean("NEUPETINVDISPLAY")) {
+ if (event.itemStack.getTagCompound() != null && event.itemStack.getTagCompound().getBoolean("NEUPETINVDISPLAY")) {
GlStateManager.translate(-200, 0, 0);
}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index 04ed9964..2d5c6e1d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -1949,12 +1949,21 @@ public class NEUOverlay extends Gui {
}
if (PetInfoOverlay.getCurrentPet() != null) {
if (NotEnoughUpdates.INSTANCE.config.petOverlay.petInvDisplay
- && NotEnoughUpdates.INSTANCE.manager.jsonToStack(NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(PetInfoOverlay.getCurrentPet().petType + ";" + PetInfoOverlay.getCurrentPet().rarity.petId)).hasDisplayName()
+ && (NotEnoughUpdates.INSTANCE.manager.jsonToStack(NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(PetInfoOverlay.getCurrentPet().petType + ";" + PetInfoOverlay.getCurrentPet().rarity.petId)).hasDisplayName()
+ || NotEnoughUpdates.INSTANCE.manager.jsonToStack(NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(PetInfoOverlay.getCurrentPet().petType + ";" + (PetInfoOverlay.getCurrentPet().rarity.petId - 1))).hasDisplayName())
&& NotEnoughUpdates.INSTANCE.config.misc.hidePotionEffect && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) {
- petSlot = NotEnoughUpdates.INSTANCE.manager.jsonToStack(
- NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(
- PetInfoOverlay.getCurrentPet().petType + ";" + PetInfoOverlay.getCurrentPet().rarity.petId));
+ if (!NotEnoughUpdates.INSTANCE.manager.jsonToStack(
+ NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(PetInfoOverlay.getCurrentPet().petType + ";" + PetInfoOverlay.getCurrentPet().rarity.petId)).hasDisplayName()) {
+ petSlot = NotEnoughUpdates.INSTANCE.manager.jsonToStack(
+ NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(
+ PetInfoOverlay.getCurrentPet().petType + ";" + (PetInfoOverlay.getCurrentPet().rarity.petId - 1)));
+ } else {
+ petSlot = NotEnoughUpdates.INSTANCE.manager.jsonToStack(
+ NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(
+ PetInfoOverlay.getCurrentPet().petType + ";" + PetInfoOverlay.getCurrentPet().rarity.petId));
+ }
petSlot.getTagCompound().setBoolean("NEUPETINVDISPLAY", true);
+ petSlot.getTagCompound().setBoolean("NEUHIDEPETTOOLTIP", NotEnoughUpdates.INSTANCE.config.petOverlay.hidePetTooltip);
ItemStack petInfo = petSlot;
if (guiScreen instanceof GuiInventory) {
@@ -2022,6 +2031,7 @@ public class NEUOverlay extends Gui {
}
}
}
+ }
SunTzu.setEnabled(textField.getText().toLowerCase().startsWith("potato"));
@@ -2375,7 +2385,6 @@ public class NEUOverlay extends Gui {
searchMode = false;
}
}
- }
/**
* Used in SettingsInfoPane to redraw the items when a setting changes.
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
index 698cfad4..7a144d56 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
@@ -62,7 +62,7 @@ public class PetInfoOverlay extends TextOverlay {
RARE(11, 2, 3, EnumChatFormatting.BLUE),
EPIC(16, 3, 4, EnumChatFormatting.DARK_PURPLE),
LEGENDARY(20, 4, 5, EnumChatFormatting.GOLD),
- MYTHIC(20, 4, 5, EnumChatFormatting.LIGHT_PURPLE);
+ MYTHIC(20, 5, 5, EnumChatFormatting.LIGHT_PURPLE);
public int petOffset;
public EnumChatFormatting chatFormatting;
@@ -833,8 +833,11 @@ public class PetInfoOverlay extends TextOverlay {
}
if (!NotEnoughUpdates.INSTANCE.config.petOverlay.petOverlayIcon) return;
-
- JsonObject petItem = NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(currentPet.petType + ";" + currentPet.rarity.petId);
+ int mythicRarity = currentPet.rarity.petId;
+ if (currentPet.rarity.petId == 5) {
+ mythicRarity = 4;
+ }
+ JsonObject petItem = NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(currentPet.petType + ";" + mythicRarity);
if (petItem != null) {
Vector2f position = getPosition(overlayWidth, overlayHeight);
int x = (int) position.x;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java
index 0880a1f8..a9adb4ad 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java
@@ -78,7 +78,7 @@ public class PetOverlay {
desc = "Shows an overlay in your inventory showing your current pet"
)
@ConfigEditorBoolean
- public boolean petInvDisplay = true;
+ public boolean petInvDisplay = false;
@Expose
@ConfigOption(
@@ -97,4 +97,12 @@ public class PetOverlay {
)
@ConfigEditorBoolean
public boolean sendPetsCommand = true;
+
+ @Expose
+ @ConfigOption(
+ name = "Hide Pet Inventory Tooltip",
+ desc = "Hides the tooltip of your active in your inventory"
+ )
+ @ConfigEditorBoolean
+ public boolean hidePetTooltip = false;
}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlayerOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlayerOverlay.java
index 32da4691..2e1e8b62 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlayerOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlayerOverlay.java
@@ -29,6 +29,14 @@ public class SlayerOverlay {
@Expose
@ConfigOption(
+ name = "Only show when relevant",
+ desc = "Only shows the overlay when you are in an area where your current Slayer can be completed"
+ )
+ @ConfigEditorBoolean
+ public boolean onlyShowWhenRelevant = true;
+
+ @Expose
+ @ConfigOption(
name = "Slayer Text",
desc = "\u00a7eDrag text to change the appearance of the overlay"
)
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/SlayerOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/SlayerOverlay.java
index 2a62d803..945e21fa 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/SlayerOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/SlayerOverlay.java
@@ -8,9 +8,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.util.EnumChatFormatting;
import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
import java.util.function.Supplier;
public class SlayerOverlay extends TextOverlay {
@@ -19,27 +17,60 @@ public class SlayerOverlay extends TextOverlay {
public static boolean isSlain = false;
public static String slayerLVL = "-1";
public static String slayerXp = "0";
+ public static long unloadOverlayTimer = -1;
+ public static long timeSinceLastBoss = 0;
+ public static long timeSinceLastBoss2 = 0;
+ public static int slayerTier = 0;
+
private static String slayerEXP = "0";
private static int slayerIntXP;
private static int untilNextSlayerLevel;
private static int xpToLevelUp;
private static boolean useSmallXpNext = true;
- public static long timeSinceLastBoss = 0;
- public static long timeSinceLastBoss2 = 0;
private static long agvSlayerTime = 0;
private static boolean isSlayerNine = false;
- public static int slayerTier = 0;
private static int xpPerBoss = 0;
private static int bossesUntilNextLevel = 0;
- public static long unloadOverlayTimer = -1;
+ private final HashSet<String> revenantLocations = new HashSet<>(Arrays.asList("Graveyard", "Coal Mine"));
+ private boolean shouldUpdate = true;
public SlayerOverlay(Position position, Supplier<List<String>> dummyStrings, Supplier<TextOverlayStyle> styleSupplier) {
super(position, dummyStrings, styleSupplier);
}
+ private boolean shouldUpdate() {
+ if (!NotEnoughUpdates.INSTANCE.config.slayerOverlay.onlyShowWhenRelevant || SBInfo.getInstance().stranded)
+ return true;
+ //Ignore if on stranded
+ String scoreboardLocation = SBInfo.getInstance().location;
+ String locrawLocation = SBInfo.getInstance().getLocation();
+ //In case something is broken still show the overlay
+ if (locrawLocation == null || scoreboardLocation == null) return true;
+ switch (SBInfo.getInstance().slayer) {
+ case "Tarantula":
+ if (!locrawLocation.equals("combat_1")) return false;
+ break;
+ case "Revenant":
+ if ((!locrawLocation.equals("hub") || !revenantLocations.contains(scoreboardLocation)) && !locrawLocation.equals("crystal_hollows")) return false;
+ break;
+ case "Sven":
+ if ((!locrawLocation.equals("hub") || !scoreboardLocation.equals("Ruins")) && (!locrawLocation.equals("foraging_1") || !scoreboardLocation.equals("Howling Cave")))
+ return false;
+ break;
+ case "Enderman":
+ if (!locrawLocation.equals("combat_3")) return false;
+ break;
+ default:
+ //A new slayer would need an update (see SBInfo)
+ return false;
+ }
+ return true;
+ }
+
@Override
public void update() {
- if (!NotEnoughUpdates.INSTANCE.config.slayerOverlay.slayerOverlay) {
+ shouldUpdate = shouldUpdate();
+ if (!NotEnoughUpdates.INSTANCE.config.slayerOverlay.slayerOverlay || !shouldUpdate) {
overlayStrings = null;
return;
}
@@ -142,7 +173,7 @@ public class SlayerOverlay extends TextOverlay {
public void updateFrequent() {
super.updateFrequent();
- if (!slayerQuest || !NotEnoughUpdates.INSTANCE.config.slayerOverlay.slayerOverlay) {
+ if (!slayerQuest || !NotEnoughUpdates.INSTANCE.config.slayerOverlay.slayerOverlay || !shouldUpdate) {
overlayStrings = null;
} else {
HashMap<Integer, String> lineMap = new HashMap<>();
@@ -150,20 +181,18 @@ public class SlayerOverlay extends TextOverlay {
NumberFormat format = NumberFormat.getIntegerInstance();
//System.out.println(SBInfo.getInstance().isSlain);
overlayStrings = new ArrayList<>();
- lineMap.put(0, EnumChatFormatting.YELLOW + "Slayer: " + EnumChatFormatting.DARK_RED + SBInfo.getInstance().slayer
- + EnumChatFormatting.GREEN + (isSlain ? " (Killed) " : " ")/* + slayerTier*/);
+ lineMap.put(0, EnumChatFormatting.YELLOW + "Slayer: " + EnumChatFormatting.DARK_RED + SBInfo.getInstance().slayer + EnumChatFormatting.GREEN + (isSlain ? " (Killed) " : " ")/* + slayerTier*/);
- if (!RNGMeter.equals("?")) {
- lineMap.put(1, EnumChatFormatting.YELLOW + "RNG Meter: " + EnumChatFormatting.DARK_PURPLE + RNGMeter);
- }
+ if (!RNGMeter.equals("?")) {
+ lineMap.put(1, EnumChatFormatting.YELLOW + "RNG Meter: " + EnumChatFormatting.DARK_PURPLE + RNGMeter);
+ }
if (!slayerLVL.equals("-1")) {
lineMap.put(2, EnumChatFormatting.YELLOW + "Lvl: " + EnumChatFormatting.LIGHT_PURPLE + slayerLVL);
}
if (timeSinceLastBoss > 0) {
- lineMap.put(3, EnumChatFormatting.YELLOW + "Kill time: " + EnumChatFormatting.RED
- + Utils.prettyTime((System.currentTimeMillis() - timeSinceLastBoss)));
+ lineMap.put(3, EnumChatFormatting.YELLOW + "Kill time: " + EnumChatFormatting.RED + Utils.prettyTime((System.currentTimeMillis() - timeSinceLastBoss)));
}
if (slayerIntXP > 0) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
index 7b5a29a9..50c113ce 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
@@ -55,6 +55,7 @@ public class SBInfo {
public String time = "";
public String objective = "";
public String slayer = "";
+ public boolean stranded = false;
public String mode = "";
@@ -104,9 +105,8 @@ public class SBInfo {
if (event.gui instanceof GuiChest) {
GuiChest chest = (GuiChest) event.gui;
ContainerChest container = (ContainerChest) chest.inventorySlots;
- String containerName = container.getLowerChestInventory().getDisplayName().getUnformattedText();
- lastOpenContainerName = containerName;
+ lastOpenContainerName = container.getLowerChestInventory().getDisplayName().getUnformattedText();
}
}
@@ -296,8 +296,8 @@ public class SBInfo {
}
isInDungeon = tempIsInDungeon;
+ boolean containsStranded = false;
for (String line : lines) { //Slayer stuff
- //System.out.println(line);
if (line.contains("Tarantula Broodfather")) {
slayer = "Tarantula";
} else if (line.contains("Revenant Horror")) {
@@ -328,7 +328,9 @@ public class SBInfo {
SlayerOverlay.slayerTier = 5;
}
}
+ if (line.contains("☀ Stranded")) containsStranded = true;
}
+ stranded = containsStranded;
if (lines.size() >= 5) {
date = Utils.cleanColour(lines.get(1)).trim();
generated by cgit (git 2.46.0) at 2024-12-02 05:54:57 +0000