From 4463c7fa78f886a8abc09e867dd17cde2a685ad4 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Fri, 8 Jul 2022 16:12:55 +0200 Subject: code cleanup --- src/main/java/at/lorenz/mod/LorenzMod.java | 3 +- src/main/java/at/lorenz/mod/config/Features.java | 14 +- .../skyblockhud/ComponentHandler.java | 124 ----- .../skyblockhud/DevModeConstants.java | 6 - .../com/thatgravyboat/skyblockhud/GuiTextures.java | 33 -- .../skyblockhud/api/KillTracking.java | 61 --- .../skyblockhud/api/LeaderboardGetter.java | 65 --- .../api/events/LocationChangeEvent.java | 15 - .../skyblockhud/api/events/ProfileJoinedEvent.java | 12 - .../api/events/ProfileSwitchedEvent.java | 12 - .../api/events/SidebarLineUpdateEvent.java | 22 - .../skyblockhud/api/events/SidebarPostEvent.java | 21 - .../skyblockhud/api/events/SidebarPreGetEvent.java | 18 - .../api/events/SkyBlockEntityKilled.java | 18 - .../skyblockhud/api/item/IAbility.java | 7 - .../api/sbentities/EntityTypeHelper.java | 36 -- .../api/sbentities/EntityTypeRegistry.java | 27 - .../skyblockhud/api/sbentities/SkyBlockEntity.java | 27 - .../skyblockhud/commands/Commands.java | 88 --- .../skyblockhud/commands/SimpleCommand.java | 60 -- .../skyblockhud/commands/SimpleSubCommand.java | 61 --- .../skyblockhud/config/KeyBindings.java | 8 - .../skyblockhud/config/SBHConfig.java | 456 ---------------- .../skyblockhud/config/SBHConfigEditor.java | 602 --------------------- .../skyblockhud/core/BackgroundBlur.java | 249 --------- .../skyblockhud/core/ChromaColour.java | 93 ---- .../skyblockhud/core/GlScissorStack.java | 86 --- .../thatgravyboat/skyblockhud/core/GuiElement.java | 12 - .../skyblockhud/core/GuiElementBoolean.java | 118 ---- .../skyblockhud/core/GuiElementColour.java | 370 ------------- .../skyblockhud/core/GuiElementTextField.java | 549 ------------------- .../skyblockhud/core/GuiScreenElementWrapper.java | 34 -- .../skyblockhud/core/config/Config.java | 6 - .../skyblockhud/core/config/KeybindHelper.java | 49 -- .../skyblockhud/core/config/Position.java | 197 ------- .../core/config/annotations/Category.java | 14 - .../core/config/annotations/ConfigAccordionId.java | 12 - .../config/annotations/ConfigEditorAccordion.java | 12 - .../config/annotations/ConfigEditorBoolean.java | 11 - .../config/annotations/ConfigEditorButton.java | 14 - .../config/annotations/ConfigEditorColour.java | 11 - .../annotations/ConfigEditorDraggableList.java | 12 - .../config/annotations/ConfigEditorDropdown.java | 14 - .../config/annotations/ConfigEditorKeybind.java | 12 - .../config/annotations/ConfigEditorSlider.java | 16 - .../core/config/annotations/ConfigEditorStyle.java | 11 - .../core/config/annotations/ConfigEditorText.java | 11 - .../core/config/annotations/ConfigOption.java | 16 - .../core/config/gui/GuiOptionEditor.java | 62 --- .../core/config/gui/GuiOptionEditorAccordion.java | 80 --- .../core/config/gui/GuiOptionEditorBoolean.java | 37 -- .../core/config/gui/GuiOptionEditorButton.java | 60 -- .../core/config/gui/GuiOptionEditorColour.java | 81 --- .../config/gui/GuiOptionEditorDraggableList.java | 268 --------- .../core/config/gui/GuiOptionEditorDropdown.java | 145 ----- .../core/config/gui/GuiOptionEditorKeybind.java | 88 --- .../core/config/gui/GuiOptionEditorSlider.java | 136 ----- .../core/config/gui/GuiOptionEditorStyle.java | 42 -- .../core/config/gui/GuiOptionEditorText.java | 78 --- .../core/config/gui/GuiPositionEditor.java | 171 ------ .../core/config/struct/ConfigProcessor.java | 166 ------ .../skyblockhud/core/util/GuiElementSlider.java | 120 ---- .../skyblockhud/core/util/StringUtils.java | 8 - .../skyblockhud/core/util/lerp/LerpUtils.java | 25 - .../skyblockhud/core/util/lerp/LerpingFloat.java | 68 --- .../skyblockhud/core/util/lerp/LerpingInteger.java | 76 --- .../skyblockhud/core/util/render/RenderUtils.java | 155 ------ .../core/util/render/TextRenderUtils.java | 155 ------ .../skyblockhud/dungeons/Classes.java | 48 -- .../skyblockhud/dungeons/DungeonHandler.java | 195 ------- .../skyblockhud/dungeons/DungeonPlayer.java | 32 -- .../skyblockhud/handlers/BossbarHandler.java | 36 -- .../skyblockhud/handlers/CooldownHandler.java | 121 ----- .../skyblockhud/handlers/CrystalWaypoints.java | 196 ------- .../skyblockhud/handlers/CurrencyHandler.java | 86 --- .../skyblockhud/handlers/HeldItemHandler.java | 31 -- .../skyblockhud/handlers/MapHandler.java | 206 ------- .../skyblockhud/handlers/NpcDialogue.java | 131 ----- .../skyblockhud/handlers/SlayerHandler.java | 130 ----- .../skyblockhud/handlers/TimeHandler.java | 28 - .../skyblockhud/handlers/WarpHandler.java | 179 ------ .../handlers/mapicons/DwarvenIcons.java | 39 -- .../skyblockhud/handlers/mapicons/HubIcons.java | 55 -- .../skyblockhud/location/EndIslandHandler.java | 53 -- .../skyblockhud/location/FarmHouseHandler.java | 41 -- .../skyblockhud/location/FarmingIslandHandler.java | 28 - .../skyblockhud/location/IslandHandler.java | 67 --- .../skyblockhud/location/LocationCategory.java | 54 -- .../skyblockhud/location/LocationHandler.java | 44 -- .../skyblockhud/location/Locations.java | 161 ------ .../skyblockhud/location/MinesHandler.java | 192 ------- .../skyblockhud/location/ParkIslandHandler.java | 29 - .../skyblockhud/mixins/GuiChestAccessor.java | 12 - .../skyblockhud/mixins/MixinEntityArrow.java | 26 - .../skyblockhud/mixins/MixinGuiIngameForge.java | 113 ---- .../skyblockhud/mixins/MixinItemStack.java | 42 -- .../mixins/MixinNetHandlerPlayClient.java | 67 --- .../skyblockhud/mixins/MixinRenderItem.java | 63 --- .../skyblockhud/overlay/DungeonOverlay.java | 149 ----- .../skyblockhud/overlay/GenericOverlays.java | 42 -- .../skyblockhud/overlay/MiningHud.java | 76 --- .../skyblockhud/overlay/OverlayHud.java | 331 ----------- .../thatgravyboat/skyblockhud/overlay/RPGHud.java | 112 ---- .../skyblockhud/playerstats/ActionBarParsing.java | 152 ------ .../thatgravyboat/skyblockhud/seasons/Season.java | 53 -- .../skyblockhud/seasons/SeasonDateHandler.java | 73 --- .../skyblockhud/textures/TextureObject.java | 37 -- .../skyblockhud/textures/Textures.java | 58 -- .../skyblockhud/tracker/TrackerFileLoader.java | 136 ----- .../skyblockhud/tracker/TrackerHandler.java | 108 ---- .../skyblockhud/tracker/TrackerObject.java | 97 ---- .../skyblockhud/utils/ComponentBuilder.java | 54 -- .../skyblockhud/utils/SpecialColour.java | 93 ---- .../com/thatgravyboat/skyblockhud/utils/Utils.java | 380 ------------- .../skyblockhud_2/ComponentHandler.java | 124 +++++ .../skyblockhud_2/DevModeConstants.java | 6 + .../thatgravyboat/skyblockhud_2/GuiTextures.java | 33 ++ .../skyblockhud_2/api/KillTracking.java | 61 +++ .../skyblockhud_2/api/LeaderboardGetter.java | 65 +++ .../api/events/LocationChangeEvent.java | 15 + .../api/events/ProfileJoinedEvent.java | 12 + .../api/events/ProfileSwitchedEvent.java | 12 + .../api/events/SidebarLineUpdateEvent.java | 22 + .../skyblockhud_2/api/events/SidebarPostEvent.java | 21 + .../api/events/SidebarPreGetEvent.java | 18 + .../api/events/SkyBlockEntityKilled.java | 18 + .../skyblockhud_2/api/item/IAbility.java | 7 + .../api/sbentities/EntityTypeHelper.java | 36 ++ .../api/sbentities/EntityTypeRegistry.java | 27 + .../api/sbentities/SkyBlockEntity.java | 27 + .../skyblockhud_2/commands/Commands.java | 88 +++ .../skyblockhud_2/commands/SimpleCommand.java | 60 ++ .../skyblockhud_2/commands/SimpleSubCommand.java | 61 +++ .../skyblockhud_2/config/KeyBindings.java | 8 + .../skyblockhud_2/config/SBHConfig.java | 456 ++++++++++++++++ .../skyblockhud_2/config/SBHConfigEditor.java | 602 +++++++++++++++++++++ .../skyblockhud_2/core/BackgroundBlur.java | 249 +++++++++ .../skyblockhud_2/core/ChromaColour.java | 93 ++++ .../skyblockhud_2/core/GlScissorStack.java | 86 +++ .../skyblockhud_2/core/GuiElement.java | 12 + .../skyblockhud_2/core/GuiElementBoolean.java | 118 ++++ .../skyblockhud_2/core/GuiElementColour.java | 370 +++++++++++++ .../skyblockhud_2/core/GuiElementTextField.java | 549 +++++++++++++++++++ .../core/GuiScreenElementWrapper.java | 34 ++ .../skyblockhud_2/core/config/Config.java | 6 + .../skyblockhud_2/core/config/KeybindHelper.java | 49 ++ .../skyblockhud_2/core/config/Position.java | 197 +++++++ .../core/config/annotations/Category.java | 14 + .../core/config/annotations/ConfigAccordionId.java | 12 + .../config/annotations/ConfigEditorAccordion.java | 12 + .../config/annotations/ConfigEditorBoolean.java | 11 + .../config/annotations/ConfigEditorButton.java | 14 + .../config/annotations/ConfigEditorColour.java | 11 + .../annotations/ConfigEditorDraggableList.java | 12 + .../config/annotations/ConfigEditorDropdown.java | 14 + .../config/annotations/ConfigEditorKeybind.java | 12 + .../config/annotations/ConfigEditorSlider.java | 16 + .../core/config/annotations/ConfigEditorStyle.java | 11 + .../core/config/annotations/ConfigEditorText.java | 11 + .../core/config/annotations/ConfigOption.java | 16 + .../core/config/gui/GuiOptionEditor.java | 62 +++ .../core/config/gui/GuiOptionEditorAccordion.java | 80 +++ .../core/config/gui/GuiOptionEditorBoolean.java | 37 ++ .../core/config/gui/GuiOptionEditorButton.java | 60 ++ .../core/config/gui/GuiOptionEditorColour.java | 74 +++ .../config/gui/GuiOptionEditorDraggableList.java | 268 +++++++++ .../core/config/gui/GuiOptionEditorDropdown.java | 145 +++++ .../core/config/gui/GuiOptionEditorKeybind.java | 88 +++ .../core/config/gui/GuiOptionEditorSlider.java | 136 +++++ .../core/config/gui/GuiOptionEditorStyle.java | 42 ++ .../core/config/gui/GuiOptionEditorText.java | 78 +++ .../core/config/gui/GuiPositionEditor.java | 171 ++++++ .../core/config/struct/ConfigProcessor.java | 166 ++++++ .../skyblockhud_2/core/util/GuiElementSlider.java | 120 ++++ .../skyblockhud_2/core/util/StringUtils.java | 8 + .../skyblockhud_2/core/util/lerp/LerpUtils.java | 25 + .../skyblockhud_2/core/util/lerp/LerpingFloat.java | 68 +++ .../core/util/lerp/LerpingInteger.java | 76 +++ .../core/util/render/RenderUtils.java | 155 ++++++ .../core/util/render/TextRenderUtils.java | 155 ++++++ .../skyblockhud_2/dungeons/Classes.java | 48 ++ .../skyblockhud_2/dungeons/DungeonHandler.java | 195 +++++++ .../skyblockhud_2/dungeons/DungeonPlayer.java | 32 ++ .../skyblockhud_2/handlers/BossbarHandler.java | 36 ++ .../skyblockhud_2/handlers/CooldownHandler.java | 121 +++++ .../skyblockhud_2/handlers/CrystalWaypoints.java | 196 +++++++ .../skyblockhud_2/handlers/CurrencyHandler.java | 86 +++ .../skyblockhud_2/handlers/HeldItemHandler.java | 31 ++ .../skyblockhud_2/handlers/MapHandler.java | 206 +++++++ .../skyblockhud_2/handlers/NpcDialogue.java | 131 +++++ .../skyblockhud_2/handlers/SlayerHandler.java | 130 +++++ .../skyblockhud_2/handlers/TimeHandler.java | 28 + .../skyblockhud_2/handlers/WarpHandler.java | 179 ++++++ .../handlers/mapicons/DwarvenIcons.java | 39 ++ .../skyblockhud_2/handlers/mapicons/HubIcons.java | 55 ++ .../skyblockhud_2/location/EndIslandHandler.java | 53 ++ .../skyblockhud_2/location/FarmHouseHandler.java | 41 ++ .../location/FarmingIslandHandler.java | 28 + .../skyblockhud_2/location/IslandHandler.java | 67 +++ .../skyblockhud_2/location/LocationCategory.java | 54 ++ .../skyblockhud_2/location/LocationHandler.java | 44 ++ .../skyblockhud_2/location/Locations.java | 161 ++++++ .../skyblockhud_2/location/MinesHandler.java | 192 +++++++ .../skyblockhud_2/location/ParkIslandHandler.java | 29 + .../skyblockhud_2/mixins/GuiChestAccessor.java | 12 + .../skyblockhud_2/mixins/MixinEntityArrow.java | 26 + .../skyblockhud_2/mixins/MixinGuiIngameForge.java | 113 ++++ .../skyblockhud_2/mixins/MixinItemStack.java | 42 ++ .../mixins/MixinNetHandlerPlayClient.java | 67 +++ .../skyblockhud_2/mixins/MixinRenderItem.java | 63 +++ .../skyblockhud_2/overlay/DungeonOverlay.java | 149 +++++ .../skyblockhud_2/overlay/GenericOverlays.java | 42 ++ .../skyblockhud_2/overlay/MiningHud.java | 76 +++ .../skyblockhud_2/overlay/OverlayHud.java | 331 +++++++++++ .../skyblockhud_2/overlay/RPGHud.java | 112 ++++ .../playerstats/ActionBarParsing.java | 152 ++++++ .../skyblockhud_2/seasons/Season.java | 53 ++ .../skyblockhud_2/seasons/SeasonDateHandler.java | 73 +++ .../skyblockhud_2/textures/TextureObject.java | 37 ++ .../skyblockhud_2/textures/Textures.java | 58 ++ .../skyblockhud_2/tracker/TrackerFileLoader.java | 136 +++++ .../skyblockhud_2/tracker/TrackerHandler.java | 108 ++++ .../skyblockhud_2/tracker/TrackerObject.java | 97 ++++ .../skyblockhud_2/utils/ComponentBuilder.java | 54 ++ .../skyblockhud_2/utils/SpecialColour.java | 93 ++++ .../thatgravyboat/skyblockhud_2/utils/Utils.java | 374 +++++++++++++ 226 files changed, 10180 insertions(+), 10194 deletions(-) delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/DevModeConstants.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/events/LocationChangeEvent.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarLineUpdateEvent.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPreGetEvent.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeRegistry.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/SkyBlockEntity.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleSubCommand.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/config/KeyBindings.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/GuiElement.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/GuiScreenElementWrapper.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/Config.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/KeybindHelper.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/Position.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/Category.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigAccordionId.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorAccordion.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorBoolean.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorButton.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorColour.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorDraggableList.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorDropdown.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorKeybind.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorSlider.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorStyle.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorText.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigOption.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorKeybind.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorStyle.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/util/render/RenderUtils.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/dungeons/Classes.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonPlayer.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/CrystalWaypoints.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/CurrencyHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/HeldItemHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/NpcDialogue.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/TimeHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/WarpHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/DwarvenIcons.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/HubIcons.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/location/FarmHouseHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/location/LocationCategory.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/location/MinesHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/mixins/GuiChestAccessor.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEntityArrow.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinGuiIngameForge.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinItemStack.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinRenderItem.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/overlay/DungeonOverlay.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/overlay/MiningHud.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/overlay/OverlayHud.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/seasons/Season.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/seasons/SeasonDateHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/textures/TextureObject.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/textures/Textures.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerObject.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/utils/ComponentBuilder.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/utils/SpecialColour.java delete mode 100644 src/main/java/com/thatgravyboat/skyblockhud/utils/Utils.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/ComponentHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/DevModeConstants.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/GuiTextures.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/KillTracking.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/LeaderboardGetter.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/events/LocationChangeEvent.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/events/ProfileJoinedEvent.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/events/ProfileSwitchedEvent.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SidebarLineUpdateEvent.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SidebarPostEvent.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SidebarPreGetEvent.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SkyBlockEntityKilled.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/item/IAbility.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/sbentities/EntityTypeHelper.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/sbentities/EntityTypeRegistry.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/api/sbentities/SkyBlockEntity.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/commands/Commands.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/commands/SimpleCommand.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/commands/SimpleSubCommand.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/config/KeyBindings.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/config/SBHConfig.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/config/SBHConfigEditor.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/BackgroundBlur.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/ChromaColour.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/GlScissorStack.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElement.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElementBoolean.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElementColour.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElementTextField.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiScreenElementWrapper.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Config.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/KeybindHelper.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Position.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/Category.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigAccordionId.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorAccordion.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorBoolean.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorButton.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorColour.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorDraggableList.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorDropdown.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorKeybind.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorSlider.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorStyle.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorText.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigOption.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditor.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorAccordion.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorBoolean.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorButton.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorColour.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorDraggableList.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorDropdown.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorKeybind.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorSlider.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorStyle.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorText.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiPositionEditor.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/config/struct/ConfigProcessor.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/util/GuiElementSlider.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/util/StringUtils.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/util/lerp/LerpUtils.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/util/lerp/LerpingFloat.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/util/lerp/LerpingInteger.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/util/render/RenderUtils.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/core/util/render/TextRenderUtils.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/dungeons/Classes.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/dungeons/DungeonHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/dungeons/DungeonPlayer.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/BossbarHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/CooldownHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/CrystalWaypoints.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/CurrencyHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/HeldItemHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/MapHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/NpcDialogue.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/SlayerHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/TimeHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/WarpHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/mapicons/DwarvenIcons.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/handlers/mapicons/HubIcons.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/location/EndIslandHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/location/FarmHouseHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/location/FarmingIslandHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/location/IslandHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/location/LocationCategory.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/location/LocationHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/location/Locations.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/location/MinesHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/location/ParkIslandHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/mixins/GuiChestAccessor.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinEntityArrow.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinGuiIngameForge.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinItemStack.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinNetHandlerPlayClient.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinRenderItem.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/overlay/DungeonOverlay.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/overlay/GenericOverlays.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/overlay/MiningHud.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/overlay/OverlayHud.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/overlay/RPGHud.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/playerstats/ActionBarParsing.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/seasons/Season.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/seasons/SeasonDateHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/textures/TextureObject.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/textures/Textures.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/tracker/TrackerFileLoader.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/tracker/TrackerHandler.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/tracker/TrackerObject.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/utils/ComponentBuilder.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/utils/SpecialColour.java create mode 100644 src/main/java/com/thatgravyboat/skyblockhud_2/utils/Utils.java (limited to 'src/main/java') diff --git a/src/main/java/at/lorenz/mod/LorenzMod.java b/src/main/java/at/lorenz/mod/LorenzMod.java index 75396d94d..e1ceea004 100644 --- a/src/main/java/at/lorenz/mod/LorenzMod.java +++ b/src/main/java/at/lorenz/mod/LorenzMod.java @@ -10,10 +10,9 @@ import at.lorenz.mod.dungeon.DungeonChatFilter; import at.lorenz.mod.dungeon.DungeonHighlightClickedBlocks; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.thatgravyboat.skyblockhud.commands.Commands; +import com.thatgravyboat.skyblockhud_2.commands.Commands; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; diff --git a/src/main/java/at/lorenz/mod/config/Features.java b/src/main/java/at/lorenz/mod/config/Features.java index e195f1d1b..f441a2db7 100644 --- a/src/main/java/at/lorenz/mod/config/Features.java +++ b/src/main/java/at/lorenz/mod/config/Features.java @@ -2,13 +2,13 @@ package at.lorenz.mod.config; import com.google.gson.annotations.Expose; import at.lorenz.mod.LorenzMod; -import com.thatgravyboat.skyblockhud.config.SBHConfigEditor; -import com.thatgravyboat.skyblockhud.core.GuiScreenElementWrapper; -import com.thatgravyboat.skyblockhud.core.config.Position; -import com.thatgravyboat.skyblockhud.core.config.annotations.Category; -import com.thatgravyboat.skyblockhud.core.config.annotations.ConfigEditorBoolean; -import com.thatgravyboat.skyblockhud.core.config.annotations.ConfigOption; -import com.thatgravyboat.skyblockhud.core.config.gui.GuiPositionEditor; +import com.thatgravyboat.skyblockhud_2.config.SBHConfigEditor; +import com.thatgravyboat.skyblockhud_2.core.GuiScreenElementWrapper; +import com.thatgravyboat.skyblockhud_2.core.config.Position; +import com.thatgravyboat.skyblockhud_2.core.config.annotations.Category; +import com.thatgravyboat.skyblockhud_2.core.config.annotations.ConfigEditorBoolean; +import com.thatgravyboat.skyblockhud_2.core.config.annotations.ConfigOption; +import com.thatgravyboat.skyblockhud_2.core.config.gui.GuiPositionEditor; import net.minecraft.client.Minecraft; public class Features { diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java deleted file mode 100644 index 5677a7382..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java +++ /dev/null @@ -1,124 +0,0 @@ -//package com.thatgravyboat.skyblockhud; -// -//import at.lorenz.mod.LorenzMod; -//import com.google.common.collect.ComparisonChain; -//import com.google.common.collect.Ordering; -//import com.thatgravyboat.skyblockhud.dungeons.DungeonHandler; -//import com.thatgravyboat.skyblockhud.location.*; -//import com.thatgravyboat.skyblockhud.seasons.SeasonDateHandler; -//import com.thatgravyboat.skyblockhud.utils.Utils; -//import java.util.Comparator; -//import java.util.List; -//import java.util.regex.Pattern; -//import net.minecraft.client.Minecraft; -//import net.minecraft.client.network.NetworkPlayerInfo; -//import net.minecraft.scoreboard.ScorePlayerTeam; -//import net.minecraft.world.WorldSettings; -//import net.minecraftforge.client.GuiIngameForge; -//import net.minecraftforge.client.event.ClientChatReceivedEvent; -//import net.minecraftforge.fml.common.eventhandler.EventPriority; -//import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -//import net.minecraftforge.fml.common.gameevent.TickEvent; -//import net.minecraftforge.fml.relauncher.Side; -//import net.minecraftforge.fml.relauncher.SideOnly; -// -//public class ComponentHandler { -// -// public static final Pattern SCOREBOARD_CHARACTERS = Pattern.compile("[^]\\[a-z A-Z:0-9/'.()+\\d-ยง?]"); -// private static final Ordering sortingList = Ordering.from(new PlayerComparator()); -// private static int ticksExisted = 0; -// -// @SubscribeEvent -// public void onClientTick(TickEvent.ClientTickEvent event) { -// Minecraft mc = Minecraft.getMinecraft(); -// ticksExisted++; -// boolean eventPass = false; -// if (mc.theWorld != null) { -// List players = sortingList.sortedCopy(mc.thePlayer.sendQueue.getPlayerInfoMap()); -// GuiIngameForge.renderObjective = !LorenzMod.hasSkyblockScoreboard() || !LorenzMod.config.misc.hideScoreboard; -// if (players != null && LorenzMod.hasSkyblockScoreboard()) { -// if (ticksExisted % 60 == 0) { -// for (NetworkPlayerInfo player : players) { -// if (player.getDisplayName() != null) { -// String formattedTabListPlayer = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(player.getDisplayName().getFormattedText())).replaceAll(""); -// if (LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)) { -// if (formattedTabListPlayer.toLowerCase().contains("secrets found:")) DungeonHandler.parseTotalSecrets(formattedTabListPlayer); -// if (formattedTabListPlayer.toLowerCase().contains("deaths:")) DungeonHandler.parseDeaths(formattedTabListPlayer); -// if (formattedTabListPlayer.toLowerCase().contains("crypts:")) DungeonHandler.parseCrypts(formattedTabListPlayer); -// } else if (LocationHandler.getCurrentLocation().getCategory().isMiningCategory()) { -// if (formattedTabListPlayer.toLowerCase().contains("mithril powder:")) { -// MinesHandler.parseMithril(formattedTabListPlayer); -// } -// if (formattedTabListPlayer.toLowerCase().contains("gemstone powder:")) { -// MinesHandler.parseGemstone(formattedTabListPlayer); -// } -// } else if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.MUSHROOMDESERT)) { -// if (formattedTabListPlayer.toLowerCase().contains("pelts:")) { -// try { -// FarmingIslandHandler.pelts = Integer.parseInt(formattedTabListPlayer.toLowerCase().replace("pelts:", "").trim()); -// } catch (Exception ignored) {} -// } -// } -// } -// } -// if (players.size() > 80) { -// for (int i = 61; i <= 80; i++) { -// if (players.get(i).getDisplayName() != null) { -// String formattedTabListPlayer = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i).getDisplayName().getFormattedText())).replaceAll(""); -// if (formattedTabListPlayer.toLowerCase().contains("event:")) { -// if (i < 80) { -// if (players.get(i + 1).getDisplayName() != null) { -// String secondLine = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i + 1).getDisplayName().getFormattedText())).replaceAll(""); -// if (!formattedTabListPlayer.contains("N/A")) { -// SeasonDateHandler.setCurrentEvent(formattedTabListPlayer.replace("Event:", ""), secondLine); -// eventPass = true; -// } -// } -// } -// } -// } -// if (i == 80 && !eventPass) { -// SeasonDateHandler.setCurrentEvent("", ""); -// } -// } -// } -// } -// if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK)) { -// if (players.size() >= 80) { -// for (int i = 41; i <= 60; i++) { -// if (players.get(i).getDisplayName() != null) { -// String formattedTabListPlayer = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i).getDisplayName().getFormattedText())).replaceAll(""); -// if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.PARK)) { -// if (formattedTabListPlayer.toLowerCase().contains("rain:")) { -// ParkIslandHandler.parseRain(formattedTabListPlayer.toLowerCase()); -// } -// } -// } -// } -// } -// } else if (ParkIslandHandler.isRaining()) { -// ParkIslandHandler.parseRain(null); -// } -// } -// } -// } -// -// @SubscribeEvent(priority = EventPriority.HIGHEST) -// public void onStatusBar(ClientChatReceivedEvent event) { -// if (event.type == 2) { -// if (LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)) DungeonHandler.parseSecrets(event.message.getFormattedText()); -// } -// } -// -// @SideOnly(Side.CLIENT) -// static class PlayerComparator implements Comparator { -// -// private PlayerComparator() {} -// -// public int compare(NetworkPlayerInfo p_compare_1_, NetworkPlayerInfo p_compare_2_) { -// ScorePlayerTeam scoreplayerteam = p_compare_1_.getPlayerTeam(); -// ScorePlayerTeam scoreplayerteam1 = p_compare_2_.getPlayerTeam(); -// return ComparisonChain.start().compareTrueFirst(p_compare_1_.getGameType() != WorldSettings.GameType.SPECTATOR, p_compare_2_.getGameType() != WorldSettings.GameType.SPECTATOR).compare(scoreplayerteam != null ? scoreplayerteam.getRegisteredName() : "", scoreplayerteam1 != null ? scoreplayerteam1.getRegisteredName() : "").compare(p_compare_1_.getGameProfile().getName(), p_compare_2_.getGameProfile().getName()).result(); -// } -// } -//} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/DevModeConstants.java b/src/main/java/com/thatgravyboat/skyblockhud/DevModeConstants.java deleted file mode 100644 index 89df438d7..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/DevModeConstants.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.thatgravyboat.skyblockhud; - -public class DevModeConstants { - - public static boolean mobDeathLogging = false; -} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java b/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java deleted file mode 100644 index bb49c9c9e..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.thatgravyboat.skyblockhud; - -import net.minecraft.util.ResourceLocation; - -public class GuiTextures { - - private GuiTextures() {} - - public static final ResourceLocation DISCORD = new ResourceLocation("skyblockhud:discord.png"); - public static final ResourceLocation TWITTER = new ResourceLocation("skyblockhud:twitter.png"); - - public static final ResourceLocation button_tex = new ResourceLocation("skyblockhud:button.png"); - - public static final ResourceLocation button_white = new ResourceLocation("skyblockhud:button_white.png"); - - public static final ResourceLocation BAR = new ResourceLocation("skyblockhud:core/bar.png"); - public static final ResourceLocation OFF = new ResourceLocation("skyblockhud:core/toggle_off.png"); - public static final ResourceLocation ONE = new ResourceLocation("skyblockhud:core/toggle_1.png"); - public static final ResourceLocation TWO = new ResourceLocation("skyblockhud:core/toggle_2.png"); - public static final ResourceLocation THREE = new ResourceLocation("skyblockhud:core/toggle_3.png"); - public static final ResourceLocation ON = new ResourceLocation("skyblockhud:core/toggle_on.png"); - public static final ResourceLocation DELETE = new ResourceLocation("skyblockhud:core/delete.png"); - - public static final ResourceLocation slider_off_cap = new ResourceLocation("skyblockhud:core/slider/slider_off_cap.png"); - public static final ResourceLocation slider_off_notch = new ResourceLocation("skyblockhud:core/slider/slider_off_notch.png"); - public static final ResourceLocation slider_off_segment = new ResourceLocation("skyblockhud:core/slider/slider_off_segment.png"); - public static final ResourceLocation slider_on_cap = new ResourceLocation("skyblockhud:core/slider/slider_on_cap.png"); - public static final ResourceLocation slider_on_notch = new ResourceLocation("skyblockhud:core/slider/slider_on_notch.png"); - public static final ResourceLocation slider_on_segment = new ResourceLocation("skyblockhud:core/slider/slider_on_segment.png"); - public static final ResourceLocation slider_button_new = new ResourceLocation("skyblockhud:core/slider/slider_button.png"); - - public static final ResourceLocation mapOverlay = new ResourceLocation("skyblockhud", "maps/map_overlay.png"); -} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java b/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java deleted file mode 100644 index 84882e1f4..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java +++ /dev/null @@ -1,61 +0,0 @@ -//package com.thatgravyboat.skyblockhud.api; -// -//import com.thatgravyboat.skyblockhud.DevModeConstants; -//import com.thatgravyboat.skyblockhud.api.events.SkyBlockEntityKilled; -//import com.thatgravyboat.skyblockhud.api.sbentities.EntityTypeRegistry; -//import java.util.HashSet; -//import java.util.Set; -//import java.util.UUID; -//import net.minecraft.client.Minecraft; -//import net.minecraft.nbt.NBTTagCompound; -//import net.minecraft.util.DamageSource; -//import net.minecraftforge.common.MinecraftForge; -//import net.minecraftforge.event.entity.EntityJoinWorldEvent; -//import net.minecraftforge.event.entity.living.LivingDeathEvent; -//import net.minecraftforge.event.entity.player.AttackEntityEvent; -//import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -// -//public class KillTracking { -// -// public static final Set attackedEntities = new HashSet<>(); -// -// @SubscribeEvent -// public void onAttack(AttackEntityEvent event) { -// if (event.target != null) { -// attackedEntities.add(event.target.getUniqueID()); -// } -// } -// -// @SubscribeEvent -// public void onDeath(LivingDeathEvent event) { -// if (DevModeConstants.mobDeathLogging) { -// //Used for testing -// System.out.println("----------------------------------------------------------------------------------------------------------------"); -// System.out.println("Name : " + event.entity.getName()); -// System.out.println("UUID : " + event.entity.getUniqueID()); -// NBTTagCompound compound = new NBTTagCompound(); -// event.entity.writeToNBT(compound); -// System.out.println("Tag : " + compound); -// System.out.println("Damage : " + getDamageSourceString(event.source)); -// System.out.println("SBH Entity ID: " + EntityTypeRegistry.getEntityId(event.entity)); -// System.out.println("----------------------------------------------------------------------------------------------------------------"); -// } -// if (attackedEntities.contains(event.entity.getUniqueID())) { -// if (EntityTypeRegistry.getEntityId(event.entity) != null) { -// MinecraftForge.EVENT_BUS.post(new SkyBlockEntityKilled(EntityTypeRegistry.getEntityId(event.entity), event.entity)); -// } -// attackedEntities.remove(event.entity.getUniqueID()); -// } -// } -// -// public static String getDamageSourceString(DamageSource source) { -// return ("{ " + source.getDamageType() + ", " + source.isDamageAbsolute() + ", " + source.isDifficultyScaled() + ", " + source.isFireDamage() + ", " + source.isProjectile() + ", " + source.isUnblockable() + ", " + source.isExplosion() + ", " + source.isMagicDamage() + ", " + source.isCreativePlayer() + ", " + source.getSourceOfDamage() + " }"); -// } -// -// @SubscribeEvent -// public void onWorldChange(EntityJoinWorldEvent event) { -// if (event.entity == Minecraft.getMinecraft().thePlayer) { -// attackedEntities.clear(); -// } -// } -//} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java b/src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java deleted file mode 100644 index de485ef5e..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java +++ /dev/null @@ -1,65 +0,0 @@ -//package com.thatgravyboat.skyblockhud.api; -// -//import static com.thatgravyboat.skyblockhud.ComponentHandler.SCOREBOARD_CHARACTERS; -// -//import at.lorenz.mod.LorenzMod; -//import com.thatgravyboat.skyblockhud.api.events.SidebarLineUpdateEvent; -//import com.thatgravyboat.skyblockhud.api.events.SidebarPostEvent; -//import com.thatgravyboat.skyblockhud.api.events.SidebarPreGetEvent; -//import com.thatgravyboat.skyblockhud.utils.Utils; -//import java.util.*; -//import java.util.stream.Collectors; -//import net.minecraft.client.Minecraft; -//import net.minecraft.scoreboard.Score; -//import net.minecraft.scoreboard.ScoreObjective; -//import net.minecraft.scoreboard.ScorePlayerTeam; -//import net.minecraft.scoreboard.Scoreboard; -//import net.minecraftforge.common.MinecraftForge; -//import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -//import net.minecraftforge.fml.common.gameevent.TickEvent; -// -//public class LeaderboardGetter { -// -// private static Map cachedScores = new HashMap<>(); -// private static List cachedScoresList = new ArrayList<>(); -// -// private static int ticks = 0; -// -// public static List getCachedScores() { -// return cachedScoresList; -// } -// -// @SubscribeEvent -// public void onClientUpdate(TickEvent.ClientTickEvent event) { -// if (event.phase.equals(TickEvent.Phase.START)) return; -// ticks++; -// if (ticks % 5 != 0) return; -// -// Minecraft mc = Minecraft.getMinecraft(); -// if (mc.theWorld != null && LorenzMod.hasSkyblockScoreboard()) { -// Scoreboard scoreboard = mc.theWorld.getScoreboard(); -// ScoreObjective sidebarObjective = scoreboard.getObjectiveInDisplaySlot(1); -// -// if (sidebarObjective != null && !MinecraftForge.EVENT_BUS.post(new SidebarPreGetEvent(scoreboard, sidebarObjective))) { -// Collection scoreList = sidebarObjective.getScoreboard().getSortedScores(sidebarObjective); -// Map scores = scoreList.stream().collect(Collectors.toMap(Score::getScorePoints, this::getLine, (s1, s2) -> s1)); -// -// if (!cachedScores.equals(scores)) { -// scores.forEach((score, name) -> { -// if (cachedScores.get(score) == null || !cachedScores.get(score).equals(name)) { -// MinecraftForge.EVENT_BUS.post(new SidebarLineUpdateEvent(name, SCOREBOARD_CHARACTERS.matcher(name).replaceAll("").trim(), score, scores.size(), scoreboard, sidebarObjective)); -// } -// }); -// cachedScores = scores; -// cachedScoresList = scores.values().stream().map(name -> SCOREBOARD_CHARACTERS.matcher(name).replaceAll("").trim()).collect(Collectors.toList()); -// } -// MinecraftForge.EVENT_BUS.post(new SidebarPostEvent(scoreboard, sidebarObjective, cachedScoresList)); -// } -// } -// } -// -// public String getLine(Score score) { -// ScorePlayerTeam scorePlayerTeam = score.getScoreScoreboard().getPlayersTeam(score.getPlayerName()); -// return Utils.removeColor(ScorePlayerTeam.formatPlayerName(scorePlayerTeam, score.getPlayerName())); -// } -//} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/LocationChangeEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/LocationChangeEvent.java deleted file mode 100644 index 560ad32e4..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/LocationChangeEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -//package com.thatgravyboat.skyblockhud.api.events; -// -//import com.thatgravyboat.skyblockhud.location.Locations; -//import net.minecraftforge.fml.common.eventhandler.Event; -// -//public class LocationChangeEvent extends Event { -// -// public Locations oldLocation; -// public Locations newLocation; -// -// public LocationChangeEvent(Locations oldLocation, Locations newLocation) { -// this.oldLocation = oldLocation; -// this.newLocation = newLocation; -// } -//} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java deleted file mode 100644 index f1d4d38b8..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.thatgravyboat.skyblockhud.api.events; - -import net.minecraftforge.fml.common.eventhandler.Event; - -public class ProfileJoinedEvent extends Event { - - public String profile; - - public ProfileJoinedEvent(String profile) { - this.profile = profile; - } -} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java deleted file mode 100644 index 408ac8ade..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.thatgravyboat.skyblockhud.api.events; - -import net.minecraftforge.fml.common.eventhandler.Event; - -public class ProfileSwitchedEvent extends Event { - - public String profile; - - public ProfileSwitchedEvent(String profile) { - this.profile = profile; - } -} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarLineUpdateEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarLineUpdateEvent.java deleted file mode 100644 index 2737ee911..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarLineUpdateEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.thatgravyboat.skyblockhud.api.events; - -import net.minecraft.scoreboard.ScoreObjective; -import net.minecraft.scoreboard.Scoreboard; -import net.minecraftforge.fml.common.eventhandler.Event; - -public class SidebarLineUpdateEvent extends Event { - - public String rawLine; - public String formattedLine; - public int position; - public Scoreboard scoreboard; - public ScoreObjective objective; - - public SidebarLineUpdateEvent(String rawLine, String formattedLine, int score, int max, Scoreboard scoreboard, ScoreObjective objective) { - this.rawLine = rawLine; - this.formattedLine = formattedLine; - this.position = max - score; - this.scoreboard = scoreboard; - this.objective = objective; - } -} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java deleted file mode 100644 index 34d27e6bc..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.thatgravyboat.skyblockhud.api.events; - -import java.util.List; -import net.minecraft.scoreboard.ScoreObjective; -import net.minecraft.scoreboard.Scoreboard; -import net.minecraftforge.fml.common.eventhandler.Event; - -public class SidebarPostEvent extends Event { - - public Scoreboard scoreboard; - public ScoreObjective objective; - public List scores; - public String[] arrayScores; - - public SidebarPostEvent(Scoreboard scoreboard, ScoreObjective objective, List scores) { - this.scoreboard = scoreboard; - this.objective = objective; - this.scores = scores; - this.arrayScores = scores.toArray(new String[] {}); - } -} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPreGetEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPreGetEvent.java deleted file mode 100644 index 0db1895c6..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPreGetEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.thatgravyboat.skyblockhud.api.events; - -import net.minecraft.scoreboard.ScoreObjective; -import net.minecraft.scoreboard.Scoreboard; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; - -@Cancelable -public class SidebarPreGetEvent extends Event { - - public Scoreboard scoreboard; - public ScoreObjective objective; - - public SidebarPreGetEvent(Scoreboard scoreboard, ScoreObjective objective) { - this.scoreboard = scoreboard; - this.objective = objective; - } -} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java deleted file mode 100644 index 61f8d824f..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.thatgravyboat.skyblockhud.api.events; - -import javax.annotation.Nullable; -import net.minecraft.entity.Entity; -import net.minecraftforge.fml.common.eventhandler.Event; - -public class SkyBlockEntityKilled extends Event { - - public String id; - - @Nullable - public Entity entity; - - public SkyBlockEntityKilled(String id, @Nullable Entity entity) { - this.id = id; - this.entity = entity; - } -} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java b/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java deleted file mode 100644 index 4f330d9a3..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thatgravyboat.skyblockhud.api.item; - -public interface IAbility { - String getAbility(); - - int getAbilityTime(); -} diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java b/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java deleted file mode 100644 index 2d8a17e4b..000000000 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java +++ /dev/null @@ -1,36 +0,0 @@ -//package com.thatgravyboat.skyblockhud.api.sbentities; -// -//import com.thatgravyboat.skyblockhud.location.LocationHandler; -//import com.thatgravyboat.skyblockhud.location.Locations; -//import net.minecraft.entity.Entity; -//import net.minecraft.entity.monster.EntityEnderman; -//import net.minecraft.entity.monster.EntityZombie; -//import net.minecraft.init.Blocks; -//import net.minecraft.init.Items; -// -//public class EntityTypeHelper { -// -// public static boolean isZealot(Entity entity) { -// if (entity instanceof EntityEnderman) { -// EntityEnderman enderman = ((EntityEnderman) entity); -// double maxHealthBase = enderman.getAttributeMap().getAttributeInstanceByName("generic.maxHealth").getBaseValue(); -// if (maxHealthBase == 13000 || (maxHealthBase == 2000d && enderman.getHeldBlockState().getBlock().equals(Blocks.end_portal_frame))) { -// return LocationHandler.getCurrentLocation().equals(Locations.DRAGONSNEST); -// } -// } -// return false; -// } -// -// public static boolean isCrypt(Entity entity) { -// if (entity instanceof EntityZombie) { -// EntityZombie zombie = ((EntityZombie) entity); -// double maxHealthBase = zombie.getAttributeMap().getAttributeInstanceByName("generic.maxHealth").getBaseValue(); -// if (maxHealthBase !=