diff options
author | TymanWasTaken <tyman@tyman.tech> | 2021-07-06 17:20:49 -0400 |
---|---|---|
committer | TymanWasTaken <tyman@tyman.tech> | 2021-07-06 17:20:49 -0400 |
commit | c04ca523f9fb9f7adefa74587db61f76deeae9f0 (patch) | |
tree | f148e7bcd9105813d3fe781badcb2cf3892712fd /src/main/java/com/thatgravyboat/skyblockhud/location | |
parent | a8e475fa0a7977f64f072548459d592274169d66 (diff) | |
download | SkyblockHud-Death-Defied-c04ca523f9fb9f7adefa74587db61f76deeae9f0.tar.gz SkyblockHud-Death-Defied-c04ca523f9fb9f7adefa74587db61f76deeae9f0.tar.bz2 SkyblockHud-Death-Defied-c04ca523f9fb9f7adefa74587db61f76deeae9f0.zip |
Increase line width
Diffstat (limited to 'src/main/java/com/thatgravyboat/skyblockhud/location')
7 files changed, 55 insertions, 252 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java index c047767..7df5667 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java @@ -37,18 +37,13 @@ public class DwarvenMineHandler { public static String getMithrilFormatted() { String output = formatter.format(mithril); - if (output.equals(".0")) output = "0.0"; else if ( - output.equals(",0") - ) output = "0,0"; + if (output.equals(".0")) output = "0.0"; else if (output.equals(",0")) output = "0,0"; return output; } public static void parseMithril(String line) { try { - mithril = - Integer.parseInt( - line.toLowerCase().replace("mithril powder:", "").trim() - ); + mithril = Integer.parseInt(line.toLowerCase().replace("mithril powder:", "").trim()); } catch (Exception ignored) {} } @@ -56,21 +51,13 @@ public class DwarvenMineHandler { public void onSidebarLineUpdate(SidebarLineUpdateEvent event) { if (event.formattedLine.toLowerCase().contains("mithril")) { try { - mithril = - Integer.parseInt( - event.formattedLine - .toLowerCase() - .replace("mithril:", "") - .trim() - ); + mithril = Integer.parseInt(event.formattedLine.toLowerCase().replace("mithril:", "").trim()); } catch (Exception ignored) {} } if (event.formattedLine.toLowerCase().contains("event")) { if (event.formattedLine.toLowerCase().contains("raffle")) { DwarvenMineHandler.currentEvent = Event.TICKET; - } else if ( - event.formattedLine.toLowerCase().contains("goblin raid") - ) { + } else if (event.formattedLine.toLowerCase().contains("goblin raid")) { DwarvenMineHandler.currentEvent = Event.GOBLIN; } } @@ -83,23 +70,14 @@ public class DwarvenMineHandler { try { eventMax = Integer.parseInt( - event.formattedLine - .toLowerCase() - .replace("pool:", "") - .trim() - .split("/")[0].trim() + event.formattedLine.toLowerCase().replace("pool:", "").trim().split("/")[0].trim() ); } catch (Exception ignored) {} - } else if ( - event.formattedLine.toLowerCase().contains("tickets:") - ) { + } else if (event.formattedLine.toLowerCase().contains("tickets:")) { try { eventProgress = Integer.parseInt( - event.formattedLine - .toLowerCase() - .replace("tickets:", "") - .split("\\(")[0].trim() + event.formattedLine.toLowerCase().replace("tickets:", "").split("\\(")[0].trim() ); } catch (Exception ignored) {} } @@ -121,12 +99,7 @@ public class DwarvenMineHandler { ) { try { eventProgress = - Integer.parseInt( - event.formattedLine - .toLowerCase() - .replace("your kills:", "") - .trim() - ); + Integer.parseInt(event.formattedLine.toLowerCase().replace("your kills:", "").trim()); } catch (Exception ignored) {} } } diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java index 51ea9d8..c989cb4 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java @@ -32,11 +32,7 @@ public class EndIslandHandler { if (input.contains(" ")) { try { return dragonTypes.valueOf( - input - .toLowerCase() - .replace("dragon", "") - .replace(" ", "") - .toUpperCase() + input.toLowerCase().replace("dragon", "").replace(" ", "").toUpperCase() ); } catch (IllegalArgumentException ignored) { return NODRAGON; diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java index 8997fa4..a4abaae 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java @@ -11,19 +11,12 @@ public class FarmingIslandHandler { @SubscribeEvent public void onSidebarPost(SidebarPostEvent event) { - boolean isTracking = Arrays - .toString(event.arrayScores) - .toLowerCase() - .contains("tracker mob location:"); + boolean isTracking = Arrays.toString(event.arrayScores).toLowerCase().contains("tracker mob location:"); if (isTracking && location == Locations.NONE) { for (int i = 0; i < event.scores.size(); i++) { String line = event.scores.get(i); - if ( - line.toLowerCase().contains("tracker mob location:") && - i > 2 - ) { - location = - Locations.get(event.scores.get(i - 1).toLowerCase()); + if (line.toLowerCase().contains("tracker mob location:") && i > 2) { + location = Locations.get(event.scores.get(i - 1).toLowerCase()); break; } } diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java index a50358d..d16a3ac 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java @@ -30,14 +30,9 @@ public class IslandHandler { public static boolean checkFlightDuration(String formatedScoreboardLine) { if ( LocationHandler.getCurrentLocation() == Locations.YOURISLAND && - Utils - .removeColor(formatedScoreboardLine.toLowerCase().trim()) - .contains("flight duration:") + Utils.removeColor(formatedScoreboardLine.toLowerCase().trim()).contains("flight duration:") ) { - String timeString = formatedScoreboardLine - .toLowerCase() - .replace("flight duration:", "") - .replace(" ", ""); + String timeString = formatedScoreboardLine.toLowerCase().replace("flight duration:", "").replace(" ", ""); String[] times = timeString.split(":"); if (times.length == 2) { int s = 0; @@ -68,18 +63,11 @@ public class IslandHandler { public static boolean checkRestone(String formatedScoreboardLine) { if (LocationHandler.getCurrentLocation() == Locations.YOURISLAND) { - if ( - formatedScoreboardLine.toLowerCase().contains("redstone:") - ) return true; + if (formatedScoreboardLine.toLowerCase().contains("redstone:")) return true; try { redstone = formatedScoreboardLine.toLowerCase().contains("redstone:") - ? Integer.parseInt( - Utils.removeWhiteSpaceAndRemoveWord( - formatedScoreboardLine, - "redstone:" - ) - ) + ? Integer.parseInt(Utils.removeWhiteSpaceAndRemoveWord(formatedScoreboardLine, "redstone:")) : 0; } catch (Exception ignored) {} } diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java index 5cd006a..bf55db6 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java @@ -14,9 +14,7 @@ public class LocationHandler { @SubscribeEvent public void onSidebarLineUpdate(SidebarLineUpdateEvent event) { if (event.rawLine.contains("\u23E3")) { - String objectiveName = event.objective - .getDisplayName() - .replaceAll("(?i)\\u00A7.", ""); + String objectiveName = event.objective.getDisplayName().replaceAll("(?i)\\u00A7.", ""); if (objectiveName.toLowerCase(Locale.ENGLISH).endsWith("guest")) { LocationHandler.setCurrentLocation(Locations.GUESTISLAND); } else { @@ -38,10 +36,7 @@ public class LocationHandler { } public static void handleLocation(String locationLine) { - String location = locationLine - .replace(" ", "") - .toUpperCase(Locale.ENGLISH) - .trim(); + String location = locationLine.replace(" ", "").toUpperCase(Locale.ENGLISH).trim(); if (location.startsWith("THECATACOMBS")) { currentLocation = Locations.CATACOMBS; } else setCurrentLocation(location.replaceAll("[^A-Za-z0-9]", "")); diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java index 7669456..74e7ae1 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java @@ -7,11 +7,7 @@ public enum Locations { //ISLAND YOURISLAND("yourisland", "Your Island", LocationCategory.ISLAND), GUESTISLAND("guestisland", "Guest Island", LocationCategory.ISLAND), - MOULBERRYSISLAND( - "moulberryisland", - "Cool Dude Hub", - LocationCategory.ISLAND - ), + MOULBERRYSISLAND("moulberryisland", "Cool Dude Hub", LocationCategory.ISLAND), //HUB VILLAGE("village", "Village", LocationCategory.HUB), AUCTIONHOUSE("auctionhouse", "Auction House", LocationCategory.HUB), @@ -33,11 +29,7 @@ public enum Locations { COALMINE("coalmine", "Coal Mine", LocationCategory.HUB), FARM("farm", "Farm", LocationCategory.HUB), LIBRARY("library", "Library", LocationCategory.HUB), - COMMUNITYCENTER( - "communitycenter", - "Community Center", - LocationCategory.HUB - ), + COMMUNITYCENTER("communitycenter", "Community Center", LocationCategory.HUB), ELECTIONROOM("electionroom", "Election Room", LocationCategory.HUB), BUILDERSHOUSE("buildershouse", "Builder's House", LocationCategory.HUB), BLACKSMITH("blacksmith", "Blacksmith", LocationCategory.HUB), @@ -47,66 +39,26 @@ public enum Locations { THEBARN("thebarn", "The Barn", LocationCategory.BARN), WINDMILL("windmill", "Windmill", LocationCategory.BARN), //MUSHROOM DESERT - MUSHROOMDESERT( - "mushroomdesert", - "Mushroom Desert", - LocationCategory.MUSHROOMDESERT - ), - DESERTSETTLEMENT( - "desertsettlement", - "Desert Settlement", - LocationCategory.MUSHROOMDESERT - ), + MUSHROOMDESERT("mushroomdesert", "Mushroom Desert", LocationCategory.MUSHROOMDESERT), + DESERTSETTLEMENT("desertsettlement", "Desert Settlement", LocationCategory.MUSHROOMDESERT), OASIS("oasis", "Oasis", LocationCategory.MUSHROOMDESERT), - MUSHROOMGORGE( - "mushroomgorge", - "Mushroom Gorge", - LocationCategory.MUSHROOMDESERT - ), - SHEPHERDSKEEP( - "shepherdskeep", - "Shepherds Keep", - LocationCategory.MUSHROOMDESERT - ), + MUSHROOMGORGE("mushroomgorge", "Mushroom Gorge", LocationCategory.MUSHROOMDESERT), + SHEPHERDSKEEP("shepherdskeep", "Shepherds Keep", LocationCategory.MUSHROOMDESERT), JAKESHOUSE("jakeshouse", "Jake's House", LocationCategory.MUSHROOMDESERT), - TREASUREHUNTERCAMP( - "treasurehuntercamp", - "Treasure Hunter Camp", - LocationCategory.MUSHROOMDESERT - ), - GLOWINGMUSHROOMCAVE( - "glowingmushroomcave", - "Glowing Mushroom Cave", - LocationCategory.MUSHROOMDESERT - ), + TREASUREHUNTERCAMP("treasurehuntercamp", "Treasure Hunter Camp", LocationCategory.MUSHROOMDESERT), + GLOWINGMUSHROOMCAVE("glowingmushroomcave", "Glowing Mushroom Cave", LocationCategory.MUSHROOMDESERT), TRAPPERSDEN("trappersden", "Trappers Den", LocationCategory.MUSHROOMDESERT), - OVERGROWNMUSHROOMCAVE( - "overgrownmushroomcave", - "Overgrown Mushroom Cave", - LocationCategory.MUSHROOMDESERT - ), + OVERGROWNMUSHROOMCAVE("overgrownmushroomcave", "Overgrown Mushroom Cave", LocationCategory.MUSHROOMDESERT), //GOLD MINE GOLDMINE("goldmine", "Gold Mine", LocationCategory.GOLDMINE), //DEEP CAVERNS DEEPCAVERNS("deepcaverns", "Deep Caverns", LocationCategory.DEEPCAVERNS), - GUNPOWDERMINES( - "gunpowdermines", - "Gunpowder Mines", - LocationCategory.DEEPCAVERNS - ), + GUNPOWDERMINES("gunpowdermines", "Gunpowder Mines", LocationCategory.DEEPCAVERNS), LAPISQUARRY("lapisquarry", "Lapis Quarry", LocationCategory.DEEPCAVERNS), PIGMANSDEN("pigmansden", "Pigman's Den", LocationCategory.DEEPCAVERNS), SLIMEHILL("slimehill", "Slimehill", LocationCategory.DEEPCAVERNS), - DIAMONDRESERVE( - "diamondreserve", - "Diamond Reserve", - LocationCategory.DEEPCAVERNS - ), - OBSIDIANSANCTUARY( - "obsidiansanctuary", - "Obsidian Sanctuary", - LocationCategory.DEEPCAVERNS - ), + DIAMONDRESERVE("diamondreserve", "Diamond Reserve", LocationCategory.DEEPCAVERNS), + OBSIDIANSANCTUARY("obsidiansanctuary", "Obsidian Sanctuary", LocationCategory.DEEPCAVERNS), //SPIDERS DEN SPIDERSDEN("spidersden", "Spider's Den", LocationCategory.SPIDERSDEN), @@ -119,142 +71,50 @@ public enum Locations { BIRCHPARK("birchpark", "Birch Park", LocationCategory.PARK), SPRUCEWOODS("sprucewoods", "Spruce Woods", LocationCategory.PARK), DARKTHICKET("darkthicket", "Dark Thicket", LocationCategory.PARK), - SAVANNAWOODLAND( - "savannawoodland", - "Savanna Woodland", - LocationCategory.PARK - ), + SAVANNAWOODLAND("savannawoodland", "Savanna Woodland", LocationCategory.PARK), JUNGLEISLAND("jungleisland", "Jungle Island", LocationCategory.PARK), //BLAZING FORTRESS - BLAZINGFORTRESS( - "blazingfortress", - "Blazing Fortress", - LocationCategory.FORTRESS - ), + BLAZINGFORTRESS("blazingfortress", "Blazing Fortress", LocationCategory.FORTRESS), //DUNGEONS DUNGEONHUB("dungeonhub", "Dungeon Hub", LocationCategory.DUNGEONHUB), CATACOMBS("catacombs", "The Catacombs", LocationCategory.DUNGEONHUB), - CATACOMBSENTRANCE( - "catacombsentrance", - "Catacombs Entrance", - LocationCategory.DUNGEONHUB - ), + CATACOMBSENTRANCE("catacombsentrance", "Catacombs Entrance", LocationCategory.DUNGEONHUB), //JERRYISLAND - JERRYSWORKSHOP( - "jerrysworkshop", - "Jerry's Workshop", - LocationCategory.JERRY - ), + JERRYSWORKSHOP("jerrysworkshop", "Jerry's Workshop", LocationCategory.JERRY), JERRYPOND("jerrypond", "Jerry Pond", LocationCategory.JERRY), //DWARVENMINES THELIFT("thelift", "The Lift", LocationCategory.DWARVENMINES), - DWARVENVILLAGE( - "dwarvenvillage", - "Dwarven Village", - LocationCategory.DWARVENMINES - ), - DWARVENMINES( - "dwarvenmines", - "Dwarven Mines", - LocationCategory.DWARVENMINES - ), + DWARVENVILLAGE("dwarvenvillage", "Dwarven Village", LocationCategory.DWARVENMINES), + DWARVENMINES("dwarvenmines", "Dwarven Mines", LocationCategory.DWARVENMINES), LAVASPRINGS("lavasprings", "Lava Springs", LocationCategory.DWARVENMINES), - PALACEBRIDGE( - "palacebridge", - "Palace Bridge", - LocationCategory.DWARVENMINES - ), + PALACEBRIDGE("palacebridge", "Palace Bridge", LocationCategory.DWARVENMINES), ROYALPALACE("royalpalace", "Royal Palace", LocationCategory.DWARVENMINES), - GRANDLIBRARY( - "grandlibrary", - "Grand Library", - LocationCategory.DWARVENMINES - ), - ROYALQUARTERS( - "royalquarters", - "Royal Quarters", - LocationCategory.DWARVENMINES - ), - BARRACKSOFHEROES( - "barracksofheroes", - "Barracks of Heroes", - LocationCategory.DWARVENMINES - ), - HANGINGCOURT( - "hangingcourt", - "Hanging Court", - LocationCategory.DWARVENMINES - ), - GREATICEWALL( - "greaticewall", - "Great Ice Wall", - LocationCategory.DWARVENMINES - ), - GOBLINBURROWS( - "goblinburrows", - "Goblin Burrows", - LocationCategory.DWARVENMINES - ), + GRANDLIBRARY("grandlibrary", "Grand Library", LocationCategory.DWARVENMINES), + ROYALQUARTERS("royalquarters", "Royal Quarters", LocationCategory.DWARVENMINES), + BARRACKSOFHEROES("barracksofheroes", "Barracks of Heroes", LocationCategory.DWARVENMINES), + HANGINGCOURT("hangingcourt", "Hanging Court", LocationCategory.DWARVENMINES), + GREATICEWALL("greaticewall", "Great Ice Wall", LocationCategory.DWARVENMINES), + GOBLINBURROWS("goblinburrows", "Goblin Burrows", LocationCategory.DWARVENMINES), FARRESERVE("farreserve", "Far Reserve", LocationCategory.DWARVENMINES), - CCMINECARTSCO( - "ccminecartco", - "Minecart Co.", - LocationCategory.DWARVENMINES - ), + CCMINECARTSCO("ccminecartco", "Minecart Co.", LocationCategory.DWARVENMINES), UPPERMINES("uppermines", "Upper Mines", LocationCategory.DWARVENMINES), - RAMPARTSQUARRY( - "rampartsquarry", - "Ramparts Quarry", - LocationCategory.DWARVENMINES - ), - GATESTOTHEMINES( - "gatestothemines", - "Gates to The Mines", - LocationCategory.DWARVENMINES - ), + RAMPARTSQUARRY("rampartsquarry", "Ramparts Quarry", LocationCategory.DWARVENMINES), + GATESTOTHEMINES("gatestothemines", "Gates to The Mines", LocationCategory.DWARVENMINES), FORGEBASIN("forgebasin", "Forge Basin", LocationCategory.DWARVENMINES), THEFORGE("theforge", "The Forge", LocationCategory.DWARVENMINES), - CLIFFSIDEVEINS( - "cliffsideveins", - "Cliffside Veins", - LocationCategory.DWARVENMINES - ), - DIVANSGATEWAY( - "divansgateway", - "Divan's Gateway", - LocationCategory.DWARVENMINES - ), + CLIFFSIDEVEINS("cliffsideveins", "Cliffside Veins", LocationCategory.DWARVENMINES), + DIVANSGATEWAY("divansgateway", "Divan's Gateway", LocationCategory.DWARVENMINES), THEMIST("themist", "The Mist", LocationCategory.DWARVENMINES), ROYALMINES("royalmines", "Royal Mines", LocationCategory.DWARVENMINES), - ARISTOCRATPASSAGE( - "aristocratpassage", - "Aristocrat Passage", - LocationCategory.DWARVENMINES - ), + ARISTOCRATPASSAGE("aristocratpassage", "Aristocrat Passage", LocationCategory.DWARVENMINES), MINERSGUILD("minersguild", "Miner's Guild", LocationCategory.DWARVENMINES), //CRYSTALHOLLOWS JUNGLE("jungle", "Jungle", LocationCategory.CRYSTALHOLLOWS), MAMGAFIELDS("magmafields", "Magma Fields", LocationCategory.CRYSTALHOLLOWS), - GOBLINHOLDOUT( - "goblinholdout", - "Goblin Holdout", - LocationCategory.CRYSTALHOLLOWS - ), - CRYSTALNUCLEUS( - "crystalnucleus", - "Crystal Nucleus", - LocationCategory.CRYSTALHOLLOWS - ), - PERCURSORREMNANTS( - "precursorremnants", - "Precursor Remnants", - LocationCategory.CRYSTALHOLLOWS - ), - MITHRILDEPOSITS( - "mithrildeposits", - "Mithril Deposits", - LocationCategory.CRYSTALHOLLOWS - ); + GOBLINHOLDOUT("goblinholdout", "Goblin Holdout", LocationCategory.CRYSTALHOLLOWS), + CRYSTALNUCLEUS("crystalnucleus", "Crystal Nucleus", LocationCategory.CRYSTALHOLLOWS), + PERCURSORREMNANTS("precursorremnants", "Precursor Remnants", LocationCategory.CRYSTALHOLLOWS), + MITHRILDEPOSITS("mithrildeposits", "Mithril Deposits", LocationCategory.CRYSTALHOLLOWS); private final String name; private final String displayName; diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java index 5d5f756..b9628d0 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java @@ -12,10 +12,8 @@ public class ParkIslandHandler { isRaining = false; rainTime = ""; } else if (tabLine.toLowerCase().contains("rain:")) { - if (tabLine.toLowerCase().contains("no rain")) isRaining = - false; else { - rainTime = - tabLine.toLowerCase().replace("rain:", "").replace(" ", ""); + if (tabLine.toLowerCase().contains("no rain")) isRaining = false; else { + rainTime = tabLine.toLowerCase().replace("rain:", "").replace(" ", ""); isRaining = true; } } |