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: Craft Materials From Bazaar #1104

Merged
merged 15 commits into from
Mar 14, 2024
Merged

Feature: Craft Materials From Bazaar #1104

merged 15 commits into from
Mar 14, 2024

Conversation

hannibal002
Copy link
Owner

@hannibal002 hannibal002 commented Mar 5, 2024 •
edited
Loading

https://www.youtube.com/watch?v=ZserMfvWsr0

Changelog New Features

  • Added Craft Materials From Bazaar. - hannibal2
    • Show in a crafting view a shopping list of materials needed when buying from the Bazaar.

Changelog Technical Details

  • Added ItemStack.toPrimitiveStackOrNull(). - hannibal2
  • Added InventoryOpenEvent.inventoryItemsPrimitive. - hannibal2

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Mar 5, 2024
@hannibal002 hannibal002 added this to the Version 0.24 milestone Mar 5, 2024
@hannibal002 hannibal002 requested a review from CalMWolfs March 5, 2024 09:56
@hannibal002 @Thunderblade73
artificial intelligence to the rescue
483d72f 
Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Thunderblade73
Thunderblade73 suggested changes Mar 5, 2024
View reviewed changes
Copy link
Contributor

@Thunderblade73 Thunderblade73 left a comment

Choose a reason for hiding this comment

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

Went through the whole code. A mix of questions about the code and cleanup

src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt Outdated Show resolved Hide resolved
@hannibal002 @Thunderblade73
fixed typo
3f85a8c 
Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 6, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 6, 2024

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

@hannibal002
Merge branch 'beta' into craft-materials-from-bazaar
488d832 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 6, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 6, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 9, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 9, 2024

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

@hannibal002
Merge branch 'beta' into craft-materials-from-bazaar
0106d9d 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@hannibal002
better name for update() function
10bf6d5
@hannibal002 hannibal002 requested a review from CalMWolfs March 9, 2024 12:30
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 9, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 9, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 9, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 9, 2024

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

@hannibal002
Merge branch 'beta' into craft-materials-from-bazaar
66ffa3a 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/events/InventoryFullyOpenedEvent.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 9, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 9, 2024

Conflicts have been resolved! 🎉

CalMWolfs
CalMWolfs requested changes Mar 10, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

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

everything looks fine apart from this

CalMWolfs
CalMWolfs reviewed Mar 10, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

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

oops forgot to submit the thing

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 11, 2024
@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.

@hannibal002
Merge branch 'beta' into craft-materials-from-bazaar
0e33779 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 11, 2024
@hannibal002 hannibal002 requested a review from CalMWolfs March 11, 2024 17:19
CalMWolfs
CalMWolfs approved these changes Mar 11, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

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

worked for me

@hannibal002 hannibal002 merged commit 10c36e3 into beta Mar 14, 2024
7 checks passed
@hannibal002 hannibal002 deleted the craft-materials-from-bazaar branch March 14, 2024 11:18
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Mar 14, 2024
Thunderblade73 added a commit to Thunderblade73/SkyHanni that referenced this pull request Mar 15, 2024
@hannibal002 @Thunderblade73
Feature: Craft Materials From Bazaar (hannibal002#1104)
23a1d04 
Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CalMWolfs CalMWolfs CalMWolfs approved these changes

@Thunderblade73 Thunderblade73 Thunderblade73 approved these changes

@RayDeeUx RayDeeUx Awaiting requested review from RayDeeUx

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

Successfully merging this pull request may close these issues.
4 participants
@hannibal002 @RayDeeUx @Thunderblade73 @CalMWolfs