diff options
| author | bowser0000 <bowser0000@gmail.com> | 2021-02-23 11:32:18 -0500 |
|---|---|---|
| committer | bowser0000 <bowser0000@gmail.com> | 2021-02-23 11:32:18 -0500 |
| commit | 72c842b945a982bc60defc2fa11d4c33a43f36aa (patch) | |
| tree | 719bc16b95ba60f2595bffe4a6d2340608f84fd4 /src/main/java | |
| parent | e5867ce13151e6689b5b4097fef610fe30650607 (diff) | |
| download | SkyblockMod-72c842b945a982bc60defc2fa11d4c33a43f36aa.tar.gz SkyblockMod-72c842b945a982bc60defc2fa11d4c33a43f36aa.tar.bz2 SkyblockMod-72c842b945a982bc60defc2fa11d4c33a43f36aa.zip | |
Update select all colour terminal answers
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/me/Danker/DankersSkyblockMod.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java index 183736b..67dd7b0 100644 --- a/src/main/java/me/Danker/DankersSkyblockMod.java +++ b/src/main/java/me/Danker/DankersSkyblockMod.java @@ -3590,7 +3590,12 @@ public class DankersSkyblockMod { } else if (inventoryName.startsWith("Select all the")) { if (terminalColorNeeded == null) return; String itemName = StringUtils.stripControlCodes(item.getDisplayName()).toUpperCase(); - shouldCancel = !(itemName.contains(terminalColorNeeded) || (terminalColorNeeded.equals("SILVER") && itemName.contains("LIGHT GRAY")) || (terminalColorNeeded.equals("WHITE") && itemName.equals("WOOL"))); + shouldCancel = !(itemName.contains(terminalColorNeeded) || + (terminalColorNeeded.equals("SILVER") && itemName.contains("LIGHT GRAY")) || + (terminalColorNeeded.equals("WHITE") && (itemName.equals("WOOL") || itemName.equals("BONE MEAL"))) || + (terminalColorNeeded.equals("BLACK") && itemName.equals("INK SACK")) || + (terminalColorNeeded.equals("BLUE") && itemName.equals("LAPIS LAZULI")) || + (terminalColorNeeded.equals("BROWN") && itemName.equals("COCOA BEANS"))); } } @@ -3763,8 +3768,13 @@ public class DankersSkyblockMod { if (item == null) continue; if (item.isItemEnchanted()) continue; String itemName = StringUtils.stripControlCodes(item.getDisplayName()).toUpperCase(); - if (itemName.contains(colour) || (colour.equals("SILVER") && itemName.contains("LIGHT GRAY")) || (colour.equals("WHITE") && itemName.equals("WOOL"))) { - Utils.drawOnSlot(chestSize, slot.xDisplayPosition, slot.yDisplayPosition, 0xBF40FF40); + if (itemName.contains(terminalColorNeeded) || + (terminalColorNeeded.equals("SILVER") && itemName.contains("LIGHT GRAY")) || + (terminalColorNeeded.equals("WHITE") && (itemName.equals("WOOL") || itemName.equals("BONE MEAL"))) || + (terminalColorNeeded.equals("BLACK") && itemName.equals("INK SACK")) || + (terminalColorNeeded.equals("BLUE") && itemName.equals("LAPIS LAZULI")) || + (terminalColorNeeded.equals("BROWN") && itemName.equals("COCOA BEANS"))) { + Utils.drawOnSlot(chestSize, slot.xDisplayPosition, slot.yDisplayPosition, 0xBF40FF40); } } } |