From d2cd150ce5836b51c8b87dfc996b52bba36d1869 Mon Sep 17 00:00:00 2001 From: Cow Date: Sat, 14 Aug 2021 16:30:44 +0200 Subject: Minor text fixes - also fixed Party Finder overlay sometimes rendering behind the UI --- .../java/de/cowtipper/cowlection/chesttracker/LowestBinsCache.java | 1 - src/main/java/de/cowtipper/cowlection/command/MooCommand.java | 2 +- src/main/java/de/cowtipper/cowlection/data/DataHelper.java | 1 + src/main/java/de/cowtipper/cowlection/listener/ChatListener.java | 3 ++- .../de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java | 1 + src/main/java/de/cowtipper/cowlection/util/Utils.java | 3 ++- 6 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/cowtipper/cowlection/chesttracker/LowestBinsCache.java b/src/main/java/de/cowtipper/cowlection/chesttracker/LowestBinsCache.java index 4fb7b26..adfeee6 100644 --- a/src/main/java/de/cowtipper/cowlection/chesttracker/LowestBinsCache.java +++ b/src/main/java/de/cowtipper/cowlection/chesttracker/LowestBinsCache.java @@ -3,7 +3,6 @@ package de.cowtipper.cowlection.chesttracker; import java.util.HashMap; public class LowestBinsCache extends HashMap { - public boolean hasData() { return size() > 0; } diff --git a/src/main/java/de/cowtipper/cowlection/command/MooCommand.java b/src/main/java/de/cowtipper/cowlection/command/MooCommand.java index f6d40f5..978e687 100644 --- a/src/main/java/de/cowtipper/cowlection/command/MooCommand.java +++ b/src/main/java/de/cowtipper/cowlection/command/MooCommand.java @@ -806,7 +806,7 @@ public class MooCommand extends CommandBase { int second = patternId & 0x3F; bannerHash.append(base64Alphabet.charAt(first)).append(base64Alphabet.charAt(second)); } - main.getChatHelper().sendMessage(new MooChatComponent("➡ View banner on needcoolshoes.com").green().setUrl("https://www.needcoolshoes.com/banner?=" + bannerHash)); + main.getChatHelper().sendMessage(new MooChatComponent("➡ View this banner on needcoolshoes.com").green().setUrl("https://www.needcoolshoes.com/banner?=" + bannerHash)); } catch (IndexOutOfBoundsException e) { main.getChatHelper().sendMessage(EnumChatFormatting.RED, "Failed to parse banner data (unknown banner pattern)."); } diff --git a/src/main/java/de/cowtipper/cowlection/data/DataHelper.java b/src/main/java/de/cowtipper/cowlection/data/DataHelper.java index f87090c..1be3f6f 100644 --- a/src/main/java/de/cowtipper/cowlection/data/DataHelper.java +++ b/src/main/java/de/cowtipper/cowlection/data/DataHelper.java @@ -574,6 +574,7 @@ public final class DataHelper { minions.put("204b03b60b99d675da18c4238d3031b6139c3763dcb59ba09129e6b3367d9f59", "Fishing IX"); minions.put("593aa3e4eaa3911456d25aab27ce63908fe7a57d880a55884498c3c6a67549b0", "Fishing X"); minions.put("46efc2d1ebb53ed1242081f22614a7e3ac983b9f6159814e6bcbc73ce7e3132a", "Fishing XI"); + minions.put("12ed654c6c1945e15faa5d59897d41876f303af9812b99aa7b768be9fcff4ccd", "Fishing XII"); minions.put("196063a884d3901c41f35b69a8c9f401c61ac9f6330f964f80c35352c3e8bfb0", "Zombie I"); minions.put("c01613ba2e99ee8326b5ceae77efb1e9afa6ae541f38b4ed63e79ecb01e725f0", "Zombie II"); diff --git a/src/main/java/de/cowtipper/cowlection/listener/ChatListener.java b/src/main/java/de/cowtipper/cowlection/listener/ChatListener.java index 6221c17..6e66ec5 100644 --- a/src/main/java/de/cowtipper/cowlection/listener/ChatListener.java +++ b/src/main/java/de/cowtipper/cowlection/listener/ChatListener.java @@ -139,7 +139,8 @@ public class ChatListener { lastTypedChars += eventCharacter; if (lastTypedChars.equalsIgnoreCase("/r ")) { // replace /r with /msg - main.getChatHelper().sendAboveChatMessage("Sending message to " + lastPMSender + "!"); + main.getChatHelper().sendAboveChatMessage("Sending message to " + lastPMSender + "! " + + EnumChatFormatting.GRAY + "Alternatively use /rr"); Minecraft.getMinecraft().displayGuiScreen(new GuiChat("/w " + lastPMSender + " ")); } } else if (Keyboard.getEventKey() == Keyboard.KEY_BACK) { // Backspace diff --git a/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java b/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java index c875ef8..6c0815f 100644 --- a/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java +++ b/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java @@ -461,6 +461,7 @@ public class DungeonsListener { (partyType != DataHelper.PartyType.CURRENT || (/*partyType == PartyType.CURRENT &&*/ Minecraft.getSystemTime() % 1000 < 600))) { GlStateManager.pushMatrix(); + GlStateManager.enableDepth(); GlStateManager.translate(0, 0, partyType.getZIndex()); Gui.drawRect(x, y, x + 16, y + 16, partyType.getColor()); GlStateManager.popMatrix(); diff --git a/src/main/java/de/cowtipper/cowlection/util/Utils.java b/src/main/java/de/cowtipper/cowlection/util/Utils.java index 0d2290d..85a8ae0 100644 --- a/src/main/java/de/cowtipper/cowlection/util/Utils.java +++ b/src/main/java/de/cowtipper/cowlection/util/Utils.java @@ -376,7 +376,7 @@ public final class Utils { reforgeLength = reforgePrefix.length() - 1; } - if(reforgeInItemName >= 0) { + if (reforgeInItemName >= 0) { if (strikethrough) { modifiedItemName.insert(reforgeInItemName, grayedOutFormatting) .insert(reforgeInItemName + reforgeLength + grayedOutFormatting.length(), originalItemName.substring(0, reforgeInItemName)); @@ -437,6 +437,7 @@ public final class Utils { try { File target = getTimestampedFileForDirectory(fileName, "json"); if (target == null) { + Cowlection.getInstance().getChatHelper().sendMessage(EnumChatFormatting.RED, "An error occurred while saving " + what); return; } Files.write(target.toPath(), nbt.getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE_NEW); -- cgit