diff options
| author | Lulonaut <67191924+Lulonaut@users.noreply.github.com> | 2022-02-12 15:51:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-13 01:51:37 +1100 |
| commit | 93a1cb847bda30d976057954a408c615e0b08119 (patch) | |
| tree | f77b9feb5047af85086fb760626c52946735a376 /src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java | |
| parent | f11f6953a207606ae920ede9e713467a47cfc018 (diff) | |
| download | notenoughupdates-93a1cb847bda30d976057954a408c615e0b08119.tar.gz notenoughupdates-93a1cb847bda30d976057954a408c615e0b08119.tar.bz2 notenoughupdates-93a1cb847bda30d976057954a408c615e0b08119.zip | |
Hide SlayerOverlay when not at a suitable location, made pet in inv force disabled and made new option to hide tooltip of pet (#79)
Co-authored-by: jani270 <jani270@gmx.de>
Co-authored-by: nopo <noahogno@gmail.com>
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java | 19 |
1 files changed, 14 insertions, 5 deletions
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. |