Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: Visitor Super Craft #1173

Merged
merged 10 commits into from
Apr 17, 2024
Merged

Feature: Visitor Super Craft #1173

merged 10 commits into from
Apr 17, 2024

Conversation

Conutik
Copy link
Contributor

@Conutik Conutik commented Mar 14, 2024

What

Added a Super Craft button in the visitor menu when there are enough resources in sacks to make the items needed.
(Discord link: https://discord.com/channels/997079228510117908/1215837122003599412)

Images

https://conutik.catto.pics/666e6874 (If you have the required materials to craft)
https://conutik.catto.pics/b932783b (If you don't have the required materials to craft)

Changelog New Features

  • Added Super Craft button to visitors for ease of access. - Conutik
    • Checks if you have enough materials to craft the items and depending on that shows the button or not.

@hannibal002 hannibal002 changed the title Visitor Super Craft Feature: Visitor Super Craft Mar 14, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Mar 14, 2024
@hannibal002 hannibal002 added this to the Version 0.24 milestone Mar 14, 2024
@hannibal002 hannibal002 self-requested a review March 17, 2024 18:17
hannibal002
hannibal002 requested changes Mar 21, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move all code out of the visitor feature class, create a new class for it. The class is already 600+ lines long. use VisitorOpenEvent with higher priority (so that it gets called after the normal event) to detect the visitor items properly.

@Conutik Conutik requested a review from hannibal002 March 22, 2024 13:09
hannibal002
hannibal002 requested changes Mar 22, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works in game, but still lots of cleanup to do.

Check if the number of items needed is in the inventory as well. Easily doable via internalName.getAmountInInventory()

src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorSupercraft.kt Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 27, 2024
Conutik and others added 2 commits March 27, 2024 23:52
@Conutik @hannibal002
Update src/main/java/at/hannibal2/skyhanni/features/garden/visitor/Ga…
ad5e264 
…rdenVisitorSupercraft.kt

Co-authored-by: hannibal2 <24389977+hannibal002@users.noreply.github.com>
@hannibal002
Merge branch 'beta' into fork/VisitorSuperCraft
606f08f 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 30, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 self-requested a review April 16, 2024 13:01
@hannibal002 hannibal002 merged commit 5f6e381 into hannibal002:beta Apr 17, 2024
3 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Apr 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hannibal002 hannibal002 hannibal002 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.25
Development

Successfully merging this pull request may close these issues.
2 participants
@Conutik @hannibal002