aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoulberry <james.jenour@student.scotch.wa.edu.au>2020-11-08 17:44:27 +1100
committerMoulberry <james.jenour@student.scotch.wa.edu.au>2020-11-08 17:44:27 +1100
commit07403ec86c53f67b94d988b4c01a0afc2fdb2810 (patch)
treefba4b3c37b02c42267e03a07453d3941c98fd66d
parentfc4143dd3c892b11ae5f427fcecc22044ff98460 (diff)
parentec0660e41145d3d9ed479b3e697afddf8ddc8c4c (diff)
downloadNotEnoughUpdates-1.7-REL.tar.gz
NotEnoughUpdates-1.7-REL.tar.bz2
NotEnoughUpdates-1.7-REL.zip
Merge branch 'beta'1.7-REL1.6-REL
uh yeah its pretty necessary guys
-rw-r--r--LICENSE81
-rw-r--r--build.gradle14
-rw-r--r--src/main/java/NotSkyblockAddonsInstallerFrame.java667
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/AccessoryBagOverlay.java824
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/BetterContainers.java454
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/BetterPortals.java206
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/CustomItemEffects.java605
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java13
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/GuiEnchantColour.java257
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/GuiItemRecipe.java10
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/GuiTextures.java19
-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/MorusIntegration.java60
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUCape2.java607
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java1564
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUIO.java109
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java715
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java566
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUOverlayPlacements.java72
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java1653
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/SBAIntegration.java211
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/TradeWindow.java1042
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java873
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java493
-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.java190
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeNode.java12
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/cosmetics/GuiCosmetics.java501
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/cosmetics/NEUCape.java345
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonBlocks.java261
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java1559
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java406
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java845
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/gamemodes/GuiGamemodes.java303
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/gamemodes/SBGamemodes.java349
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/infopanes/CollectionLogInfoPane.java54
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/infopanes/CosmeticsInfoPane.java83
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/infopanes/DevInfoPane.java862
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/infopanes/HTMLInfoPane.java15
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/infopanes/InfoPane.java2
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/infopanes/SettingsInfoPane.java583
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/itemeditor/GuiElementTextField.java118
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBAnchorPoint.java14
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBDeserializer.java20
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBGuiElement.java2
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBGuiGroup.java8
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBGuiGroupAligned.java67
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBGuiGroupFloating.java95
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBGuiGroupHorz.java47
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinEntityPlayer.java25
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinEntityRenderer.java72
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiChest.java52
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java118
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinInventoryEffectRenderer.java1
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinItemStack.java37
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java29
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRender.java31
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRenderFish.java139
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRenderGlobal.java69
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRenderItem.java53
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRenderList.java24
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinTileEntitySpecialRenderer.java35
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinVboRenderList.java24
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/Options.java562
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java2499
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/Panorama.java157
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/PlayerStats.java514
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java1017
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/questing/NEUQuesting.java67
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/questing/SBInfo.java128
-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/Constants.java15
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java107
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/SpecialColour.java95
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/TexLoc.java8
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java486
-rw-r--r--src/main/resources/assets/notenoughupdates/accessory_bag_overlay.pngbin0 -> 973 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/button20x.pngbin0 -> 170 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/button_white.pngbin0 -> 6570 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/contrib.png (renamed from src/main/resources/assets/notenoughupdates/contrib.png)bin189394 -> 189394 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/fade.png (renamed from src/main/resources/assets/notenoughupdates/fade.png)bin18572 -> 18572 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/gravy.png (renamed from src/main/resources/assets/notenoughupdates/gravy.png)bin58330 -> 58330 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/lava.pngbin0 -> 169280 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/lightning.pngbin0 -> 6490 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/mbstaff.pngbin0 -> 470630 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/mcworld.pngbin0 -> 291014 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/nullzee.png (renamed from src/main/resources/assets/notenoughupdates/nullzee.png)bin108263 -> 108263 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/packshq.pngbin0 -> 22716 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/patreon1.pngbin0 -> 46767 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/patreon2.pngbin0 -> 45479 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/space.pngbin0 -> 866931 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/capes/testcape.png (renamed from src/main/resources/assets/notenoughupdates/testcape.png)bin21571 -> 21571 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/colour_selector_bar.pngbin0 -> 245 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/colour_selector_bar_alpha.pngbin0 -> 240 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/colour_selector_chroma.pngbin0 -> 211 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/colour_selector_dot.pngbin0 -> 3677 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/cosmetics_fg.pngbin0 -> 1607 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/custom_ench_colour.pngbin0 -> 4530 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/custom_trade.pngbin0 -> 10346 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_chest_worth.pngbin1804 -> 1900 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/1.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/10.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/10.pngbin0 -> 7050 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/11.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/11.pngbin0 -> 16913 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/2.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/2.pngbin0 -> 1006 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/3.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/3.pngbin0 -> 6971 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/4.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/4.pngbin0 -> 10886 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/5.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/5.pngbin0 -> 13433 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/6.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/6.pngbin0 -> 10655 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/7.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/7.pngbin0 -> 4217 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/8.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/8.pngbin0 -> 6904 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/9.json3
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/large/9.pngbin0 -> 6779 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/dungeon_map/borders/map_border_dragon_stone.pngbin0 -> 4952 b