aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman / Linnea Gräf <nea@nea.moe>2023-03-09 17:35:18 +0100
committerGitHub <noreply@github.com>2023-03-09 17:35:18 +0100
commit4d3e68e8777ac174b938ad63c3367a20e99e06ac (patch)
treeb4e5567694eda82519462e21728edc0b17954957
parent64f9b6b44426b907f3f2cb916f778fb92b441389 (diff)
parent90b184ecfccfcada882ce8cd89286b0ffa4cdef3 (diff)
downloadSkyHanni-4d3e68e8777ac174b938ad63c3367a20e99e06ac.tar.gz
SkyHanni-4d3e68e8777ac174b938ad63c3367a20e99e06ac.tar.bz2
SkyHanni-4d3e68e8777ac174b938ad63c3367a20e99e06ac.zip
Merge branch 'dev_3' into yaw_snapping
-rw-r--r--.github/workflows/build.yml10
-rw-r--r--CHANGELOG.md28
-rw-r--r--FEATURES.md17
-rw-r--r--build.gradle.kts6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java29
-rw-r--r--src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt104
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/Features.java54
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/core/BackgroundBlur.java289
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java32
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/DevData.java6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Diana.java25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Garden.java220
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Hidden.java9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Minions.java16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Misc.java19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt177
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt78
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt33
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/SendTitleHelper.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt37
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/VanillaItemManager.kt51
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/InventoryOpenEvent.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/OwnInventorItemUpdateEvent.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt66
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarUpdateTimer.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt53
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt70
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt258
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CollectionStep.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonData.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt29
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt61
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt80
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneDisplay.kt238
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenCustomKeybinds.kt135
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextPlotPrice.kt47
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt79
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt343
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorTimer.kt26
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/SkyMartBestProfit.kt52
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/AuctionsHighlighter.kt40
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt92
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionCraftHelper.kt162
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ChickenHeadTimer.kt65
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CollectionCounter.kt86
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/HideDeadEntities.kt74
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/RealTime.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt41
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/DojoQuest.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestCategory.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderLivingEntityHelper.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorKeyBinding.java12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderManager.java4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/AccessorGuiContainer.java17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiNewChat.java1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/inventory/GuiEditSignMixin.java265
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/transformers/tileentity/TileEntitySignMixin.java56
-rw-r--r--src/main/java/at/hannibal2/skyhanni/sign/IEditSign.java7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/sign/SignSelectionList.java215
-rw-r--r--src/main/java/at/hannibal2/skyhanni/sign/SkyBlockcatiaConfig.java7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ItemResolutionQuery.java200
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt22
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt174
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt28
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt256
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt2
-rw-r--r--src/main/resources/mixins.skyhanni.json5
99 files changed, 2860 insertions, 2028 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f7266f909..81274d993 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,12 +18,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Set up JDK 17
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
with:
java-version: 17
- - uses: actions/cache@v2
+ distribution: temurin
+ cache: gradle
+ - uses: actions/cache@v3
with:
path: |
~/.gradle/caches
@@ -33,7 +35,7 @@ jobs:
${{ runner.os }}-gradle-
- name: Build with Gradle
run: ./gradlew build
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
with:
path: build/libs/*.jar
- name: Stop gradle daemons
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f067203..bf339d140 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,33 @@
# SkyHanni - Change Log
-## Version 0.17.UNRELEASED
+## Version 0.17.BETA
### Features
+ Added **Time to Kill** - Show the time it takes to kill the Slayer boss.
++ Added skill and collection level as item stack.
++ Added **Auction Highlighter** - Highlight own items that are sold in green and that are expired in red.
++ Added support for tier 1 minions and title send for the minion craft helper.
++ Added Chicken head Timer.
++ Added **rancher boots** speed display.
++ Added **Optimal Speed** - Show the optimal speed for your current tool in the hand. (Ty MelonKingDE for the values)
### Garden Features
+ Added **Copper Price** - Show copper to coin prices inside the Sky Mart inventory.
+ Added **Visitor Display** - Show all items needed for the visitors.
-+ Added **Highlight Ready** - Highlight the visitor when the required items are in the inventory.
++ Added **Visitor Highlight** - Highlight visitor when the required items are in the inventory or the visitor is new and needs to checked what items it needs.
+ Added **Show Price** - Show the bazaar price of the items required for the visitors.
+ Added **Crop Milestone** Number - Show the number of the crop milestone in the inventory.
+ Added **Crop Upgrades** Number - Show the number of upgrades in the crop upgrades inventory.
+ Added **Yaw Snapping** - Make it harder to overshoot certain yaw angles. (contrib nea89)
+ Added **Visitor Timer** - Timer when the next visitor will appear, and a number how many visitors are already waiting.
++ Added **Visitor Notification** - Show as title and in chat when a new visitor is visiting your island.
++ Added **Plot Price** - Show the price of the plot in coins when inside the Configure Plots inventory.
++ Added **Garden Crop Milestone Display** - Shows the progress and ETA until the next crop milestone is reached and the current crops/minute value. (Requires a tool with ei