aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-10-28 00:21:41 -0400
committerGitHub <noreply@github.com>2024-10-28 00:21:41 -0400
commit3bb808e13c229ff249389f17a0fc543aa2497552 (patch)
tree0bc08890e97ed23d103ccad7396e9f859e8f0214 /src/main/java
parent47d0444f05e6392dca8585cd5200bbb6f5dc618f (diff)
parent9aabbd7b5216f13b08ee0566af9a4f5017cc622a (diff)
downloadSkyblocker-3bb808e13c229ff249389f17a0fc543aa2497552.tar.gz
Skyblocker-3bb808e13c229ff249389f17a0fc543aa2497552.tar.bz2
Skyblocker-3bb808e13c229ff249389f17a0fc543aa2497552.zip
Merge pull request #1030 from SkyblockerMod/1.21.2
1.21.2/1.21.3
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/hysky/skyblocker/SkyblockerScreen.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/UpdateNotifications.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockerJEIPlugin.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockCraftingDisplay.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/config/ConfigUtils.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java16
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/debug/Debug.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java19
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/BackgroundRendererMixin.java19
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java19
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java26
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/ComponentHolderMixin.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/DrawContextMixin.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/DyedColorComponentMixin.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/EntityMixin.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/EntityRenderDispatcherMixin.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/FarmlandBlockMixin.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/InventoryScreenMixin.java40
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/PlayerInventoryMixin.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/PlayerSkinTextureMixin.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/WorldRendererMixin.java18
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/DrawContextInvoker.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/FrustumInvoker.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/HandledScreenAccessor.java38
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/RecipeBookWidgetAccessor.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/accessors/SkullBlockEntityAccessor.java18
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/PetCache.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java17
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/RarityWidget.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SliderWidget.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/SkyblockXpMessages.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AbilityFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/AbilityFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AdFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/AdFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AoteFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/AoteFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AutopetFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/AutopetFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/DeathFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/DicerFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/DicerFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/HealFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/HealFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ImplosionFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/MimicFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/MoltenWaveFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/MoltenWaveFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ShowOffFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/ShowOffFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/SimpleChatFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/SimpleChatFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/TeleportPadFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ToggleSkyMallFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/TimeTowerReminder.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/DangerWarning.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java15
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsChestHighlighter.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/GlaciteColdOverlay.java29
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/WishingCompassSolver.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/events/EventToast.java17
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java11
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/fancybars/EditBarWidget.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/fancybars/StatusBar.java14
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/fancybars/StatusBarsConfigScreen.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java43
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/ItemProtection.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/ItemRarityBackgrounds.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java88
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockInventoryScreen.java13
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java9
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/CompactorDeletorPreview.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/CompactorPreviewTooltipComponent.java19
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListTab.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListWidget.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/ResultButtonWidget.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/SearchResultsWidget.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/UpcomingEventsTab.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/NoopRecipeScreenHandler.java43
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/RecipeAreaDisplay.java22
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/RecipeTab.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/SkyblockCraftingRecipeResults.java300
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/SkyblockCraftingTab.java65
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/SkyblockRecipeBookWidget.java241
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/SkyblockRecipeResultButton.java58