aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-05-04 19:14:06 -0400
committerGitHub <noreply@github.com>2024-05-04 19:14:06 -0400
commit4a4234d7c9d4f038d4fa418fb15ef24ce3fcc501 (patch)
tree6e87c6b67aabeb82dbe075d68c16b5492ff92c9b /src
parented0489539902d77595625aaa3bca4e328e1f7e88 (diff)
parentf7b13895a4605e1d22e2c00e7b62c7365902d1aa (diff)
downloadSkyblocker-4a4234d7c9d4f038d4fa418fb15ef24ce3fcc501.tar.gz
Skyblocker-4a4234d7c9d4f038d4fa418fb15ef24ce3fcc501.tar.bz2
Skyblocker-4a4234d7c9d4f038d4fa418fb15ef24ce3fcc501.zip
Merge pull request #669 from SkyblockerMod/1.20.5
1.20.5 & 1.20.6
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/hysky/skyblocker/SkyblockerMod.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java13
-rw-r--r--src/main/java/de/hysky/skyblocker/debug/Debug.java45
-rw-r--r--src/main/java/de/hysky/skyblocker/debug/SnapshotDebug.java32
-rw-r--r--src/main/java/de/hysky/skyblocker/events/HudRenderEvents.java50
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/ArmorTrimMixin.java34
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java82
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/ItemMixin.java19
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/accessor/ItemStackAccessor.java14
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/AbstractInventoryScreenMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/BatEntityMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/BatEntityMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java)4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/ClientPlayerEntityMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/CommandTreeS2CPacketMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/CommandTreeS2CPacketMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/ComponentHolderMixin.java39
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/DataTrackerMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/DataTrackerMixin.java)10
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/DrawContextMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java)10
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/DyedColorComponentMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/DyeableItemMixin.java)19
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/EntityRenderDispatcherMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/EntityRenderDispatcherMixin.java)4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/FarmlandBlockMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java)3
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/GenericContainerScreenHandlerMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/GenericContainerScreenHandlerMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java)43
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/HandledScreenProviderMixin.java99
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java)51
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/InGameOverlayRendererMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/InGameOverlayRendererMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/InventoryScreenMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/InventoryScreenMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java)15
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/LeverBlockMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/LeverBlockMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/LivingEntityRendererMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/LivingEntityRendererMixin.java)4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java)16
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/MouseMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/MouseMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/PlayerInventoryMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/PlayerInventoryMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/PlayerListHudMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/PlayerListHudMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/PlayerSkinProviderMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java)4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/PlayerSkinTextureMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/PlayerSkinTextureMixin.java)4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/RenderFishMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/ScoreboardMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/ScoreboardMixin.java)4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/SocialInteractionsPlayerListWidgetMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/SocialInteractionsPlayerListWidgetMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/WindowMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/WindowMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/WorldRendererMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/WorldRendererMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/YggdrasilMinecraftSessionServiceMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java)4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/YggdrasilServicesKeyInfoMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java)4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/BeaconBlockEntityRendererInvoker.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/BeaconBlockEntityRendererInvoker.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/DrawContextInvoker.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/DrawContextInvoker.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/EndermanEntityAccessor.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/EndermanEntityAccessor.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/FrustumInvoker.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/FrustumInvoker.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/HandledScreenAccessor.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/HandledScreenAccessor.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/MessageHandlerAccessor.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/MessageHandlerAccessor.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/PlayerListHudAccessor.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/PlayerListHudAccessor.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/RecipeBookWidgetAccessor.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/RecipeBookWidgetAccessor.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/ScreenAccessor.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/ScreenAccessor.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/SkullBlockEntityAccessor.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/SkullBlockEntityAccessor.java)5
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/SlotAccessor.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/SlotAccessor.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/WorldRendererAccessor.java (renamed from src/main/java/de/hysky/skyblocker/mixin/accessor/WorldRendererAccessor.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/discordipc/ConnectionMixin.java (renamed from src/main/java/de/hysky/skyblocker/mixin/discordipc/ConnectionMixin.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java19
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java17
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionHouseScreenHandler.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/AuctionTypeWidget.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/CategoryTabWidget.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SortWidget.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java18
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java275
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java34
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java16
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/FireFreezeStaffTimer.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java11
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java31
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java17
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java15
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java13
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java14
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java9
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java9
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java137
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java16
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java9
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/entity/MobBoundingBoxes.java21
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java125
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/experiment/SuperpairsSolver.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java4