diff options
| author | ThatGravyBoat <gravyboat211@gmail.com> | 2021-02-10 09:02:09 -0330 |
|---|---|---|
| committer | ThatGravyBoat <gravyboat211@gmail.com> | 2021-02-10 09:02:09 -0330 |
| commit | c58414eabf2ba4c69e8135a09724f36fac835f10 (patch) | |
| tree | 676a845e5e92128955c35e149414897fb10b53f9 /src/main | |
| parent | 0ee60ad03b55ca65bc76134062532c92065e9357 (diff) | |
| download | NotEnoughUpdates-c58414eabf2ba4c69e8135a09724f36fac835f10.tar.gz NotEnoughUpdates-c58414eabf2ba4c69e8135a09724f36fac835f10.tar.bz2 NotEnoughUpdates-c58414eabf2ba4c69e8135a09724f36fac835f10.zip | |
Added PetInfo display, allows for the checking of certain pets for certain features, also adds monkey check for treecap cooldown and adds a notification if you are using the wrong pet.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfo.java | 8 | ||||
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfo.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfo.java index 49b6c164..187ca897 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfo.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfo.java @@ -250,8 +250,8 @@ public class PetInfo { int xPos = config.overlay.petInfoPosition.getAbsX(scaledResolution, Math.max(font.getStringWidth(petName), font.getStringWidth(lvlString)) + 20); int yPos = config.overlay.petInfoPosition.getAbsY(scaledResolution, (currentPet.petLevel.level < 100 ? 22 : 11)) + 2; - if (!(mc.currentScreen instanceof GuiPositionEditor) && overlayStyle == 0) - Gui.drawRect(xPos, yPos-2, xPos+Math.max(font.getStringWidth(lvlString), font.getStringWidth(petName))+20, yPos+(currentPet.petLevel.level < 100 ? 20 : 16), 0x80000000); + if (!(mc.currentScreen instanceof GuiPositionEditor) && (overlayStyle == 0 || overlayStyle == 4)) + Gui.drawRect(xPos, yPos-2, xPos+Math.max(font.getStringWidth(lvlString), font.getStringWidth(petName))+22, yPos+(currentPet.petLevel.level < 100 ? 20 : 16), 0x80000000); if (overlayStyle == 3) { for (int xO = -2; xO <= 2; xO++) { @@ -263,7 +263,7 @@ public class PetInfo { } } - font.drawString(petName, xPos + 20, yPos + (currentPet.petLevel.level < 100 ? 0 : 4), 0xffffff, overlayStyle == 2); + font.drawString(petName, xPos + 20, yPos + (currentPet.petLevel.level < 100 ? 0 : 4), 0xffffff, overlayStyle == 2 || overlayStyle == 4); if (currentPet.petLevel.level < 100){ if (overlayStyle == 3) { for (int xO = -2; xO <= 2; xO++) { @@ -274,7 +274,7 @@ public class PetInfo { } } } - font.drawString(lvlString, xPos + 20, yPos + font.FONT_HEIGHT, 0xffffff, overlayStyle == 2); + font.drawString(lvlString, xPos + 20, yPos + font.FONT_HEIGHT, 0xffffff, overlayStyle == 2 || overlayStyle == 4); } JsonObject petItem = NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(currentPet.petType+";"+currentPet.rarity.petId); 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 1f70d235..45d6705a 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java @@ -1165,7 +1165,7 @@ public class NEUConfig extends Config { desc = "Change the style of the Pet Info overlay" ) @ConfigEditorDropdown( - values = {"Background", "No Shadow", "Shadow", "Full Shadow"} + values = {"Background", "No Shadow", "Shadow Only", "Full Shadow", "With Shadow"} ) public int petInfoOverlayStyle = 0; } |