aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoulberry <jjenour@student.unimelb.edu.au>2020-08-09 07:08:32 +1000
committerGitHub <noreply@github.com>2020-08-09 07:08:32 +1000
commitd313a5c81a553881123c1e478c96a34e07517db4 (patch)
tree36b1abb309ae0f96c378c3c1b917bb9f54bb0234
parentf7d3491def0f7498d7bf0d547445f75f0c515912 (diff)
parent0d3a0d7355dac828a97977730bc3acc4dee7e1b4 (diff)
downloadNotEnoughUpdates-1.2.3-BETA.tar.gz
NotEnoughUpdates-1.2.3-BETA.tar.bz2
NotEnoughUpdates-1.2.3-BETA.zip
Merge pull request #17 from Moulberry/beta1.2.3-BETA1.2.2-BETA1.2.1-BETA1.2-REL
Beta
-rw-r--r--LICENSE81
-rw-r--r--build.gradle3
-rw-r--r--src/main/java/NotSkyblockAddonsInstallerFrame.java667
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java13
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/GuiEnchantColour.java224
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/GuiItemRecipe.java10
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/HelpGUI.java189
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/ItemRarityHalo.java251
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUIO.java13
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java419
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java53
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUOverlayPlacements.java35
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java621
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/SBAIntegration.java196
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java533
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java205
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/commands/SimpleCommand.java20
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java2
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeNode.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/cosmetics/NEUCape.java210
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/infopanes/CollectionLogInfoPane.java25
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/itemeditor/GuiElementTextField.java49
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBAnchorPoint.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBGuiGroup.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBGuiGroupFloating.java58
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinInventoryEffectRenderer.java1
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRenderItem.java53
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/Options.java83
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java2473
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/Panorama.java146
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/PlayerStats.java505
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java890
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/questing/NEUQuesting.java67
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/questing/SBScoreboardData.java76
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/questing/requirements/RequirementApi.java7
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/questing/requirements/RequirementIslandType.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java78
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java262
-rw-r--r--src/main/resources/assets/notenoughupdates/button20x.pngbin0 -> 170 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/custom_ench_colour.pngbin0 -> 4530 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/folder.pngbin0 -> 454 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_day/panorama_0.jpgbin0 -> 21394 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_day/panorama_1.jpgbin0 -> 20539 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_day/panorama_2.jpgbin0 -> 18095 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_day/panorama_3.jpgbin0 -> 21069 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_day/panorama_4.jpgbin0 -> 17245 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_day/panorama_5.jpgbin0 -> 13035 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_night/panorama_0.jpgbin0 -> 15969 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_night/panorama_1.jpgbin0 -> 14301 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_night/panorama_2.jpgbin0 -> 12769 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_night/panorama_3.jpgbin0 -> 12440 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_night/panorama_4.jpgbin0 -> 11408 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_1_night/panorama_5.jpgbin0 -> 16017 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_day/panorama_0.jpgbin0 -> 30425 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_day/panorama_1.jpgbin0 -> 18248 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_day/panorama_2.jpgbin0 -> 14289 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_day/panorama_3.jpgbin0 -> 19871 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_day/panorama_4.jpgbin0 -> 18328 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_day/panorama_5.jpgbin0 -> 8718 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_night/panorama_0.jpgbin0 -> 14773 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_night/panorama_1.jpgbin0 -> 11063 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_night/panorama_2.jpgbin0 -> 5580 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_night/panorama_3.jpgbin0 -> 17256 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_night/panorama_4.jpgbin0 -> 12133 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_2_night/panorama_5.jpgbin0 -> 4516 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_day/panorama_0.jpgbin0 -> 34048 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_day/panorama_1.jpgbin0 -> 28471 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_day/panorama_2.jpgbin0 -> 22159 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_day/panorama_3.jpgbin0 -> 27487 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_day/panorama_4.jpgbin0 -> 19750 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_day/panorama_5.jpgbin0 -> 21597 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_night/panorama_0.jpgbin0 -> 18255 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_night/panorama_1.jpgbin0 -> 11295 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_night/panorama_2.jpgbin0 -> 13877 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_night/panorama_3.jpgbin0 -> 18438 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_night/panorama_4.jpgbin0 -> 10785 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/combat_3_night/panorama_5.jpgbin0 -> 12742 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dark_auction/panorama_0.jpgbin0 -> 19008 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dark_auction/panorama_1.jpgbin0 -> 19414 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dark_auction/panorama_2.jpgbin0 -> 19388 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dark_auction/panorama_3.jpgbin0 -> 19497 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dark_auction/panorama_4.jpgbin0 -> 18727 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dark_auction/panorama_5.jpgbin0 -> 18871 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon/panorama_0.jpgbin0 -> 16337 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon/panorama_1.jpgbin0 -> 19376 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon/panorama_2.jpgbin0 -> 17633 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon/panorama_3.jpgbin0 -> 18424 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon/panorama_4.jpgbin0 -> 18780 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon/panorama_5.jpgbin0 -> 18041 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon_hub/panorama_0.jpgbin0 -> 16337 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon_hub/panorama_1.jpgbin0 -> 19376 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon_hub/panorama_2.jpgbin0 -> 17633 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon_hub/panorama_3.jpgbin0 -> 18424 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon_hub/panorama_4.jpgbin0 -> 18780 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dungeon_hub/panorama_5.jpgbin0 -> 18041 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_day/panorama_0.jpgbin0 -> 35131 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_day/panorama_1.jpgbin0 -> 32356 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_day/panorama_2.jpgbin0 -> 34147 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_day/panorama_3.jpgbin0 -> 42291 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_day/panorama_4.jpgbin0 -> 25831 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_day/panorama_5.jpgbin0 -> 20933 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_night/panorama_0.jpgbin0 -> 28070 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_night/panorama_1.jpgbin0 -> 30401 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_night/panorama_2.jpgbin0 -> 29899 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_night/panorama_3.jpgbin0 -> 30543 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_night/panorama_4.jpgbin0 -> 27401 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/dynamic_night/panorama_5.jpgbin0 -> 21828 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_day/panorama_0.jpgbin0 -> 34294 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_day/panorama_1.jpgbin0 -> 47518 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_day/panorama_2.jpgbin0 -> 46569 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_day/panorama_3.jpgbin0 -> 36648 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_day/panorama_4.jpgbin0 -> 15788 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_day/panorama_5.jpgbin0 -> 47536 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_night/panorama_0.jpgbin0 -> 20273 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_night/panorama_1.jpgbin0 -> 23666 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_night/panorama_2.jpgbin0 -> 26548 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_night/panorama_3.jpgbin0 -> 22310 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_night/panorama_4.jpgbin0 -> 9398 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_1_night/panorama_5.jpgbin0 -> 29882 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_day/panorama_0.jpgbin0 -> 30779 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_day/panorama_1.jpgbin0 -> 29586 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_day/panorama_2.jpgbin0 -> 30070 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_day/panorama_3.jpgbin0 -> 30822 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_day/panorama_4.jpgbin0 -> 11867 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_day/panorama_5.jpgbin0 -> 24780 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_night/panorama_0.jpgbin0 -> 19525 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_night/panorama_1.jpgbin0 -> 14742 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_night/panorama_2.jpgbin0 -> 16263 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_night/panorama_3.jpgbin0 -> 17533 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_night/panorama_4.jpgbin0 -> 6528 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/farming_2_night/panorama_5.jpgbin0 -> 17504 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_day/panorama_0.jpgbin0 -> 42789 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_day/panorama_1.jpgbin0 -> 32963 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_day/panorama_2.jpgbin0 -> 36208 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_day/panorama_3.jpgbin0 -> 34657 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_day/panorama_4.jpgbin0 -> 25234 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_day/panorama_5.jpgbin0 -> 29243 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_night/panorama_0.jpgbin0 -> 16958 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_night/panorama_1.jpgbin0 -> 16735 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_night/panorama_2.jpgbin0 -> 15980 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_night/panorama_3.jpgbin0 -> 17531 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_night/panorama_4.jpgbin0 -> 11656 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/foraging_1_night/panorama_5.jpgbin0 -> 17297 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/hub_day/panorama_0.jpgbin0 -> 20453 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/panoramas/hub_day/panorama_1.jpgbin0 ->