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.

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

Backend: Create and use PSSChatEvent #441

Merged
merged 6 commits into from
Jul 24, 2024

Conversation

j10a1n15
Copy link
Collaborator

@j10a1n15 j10a1n15 commented Jul 22, 2024

Dependencies:

This Pull Request creates and uses the PSSChatEvent
This does not yet support event cancelling, which should come soon though once the whole event system will be reworked.

j10a1n15 added 4 commits July 22, 2024 23:14
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
…d-miningevents' into backend/pss-chat

# Conflicts:
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/events/EventManager.kt
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15 j10a1n15 marked this pull request as draft July 22, 2024 21:22
@j10a1n15 j10a1n15 requested a review from Su386yt July 22, 2024 21:26
@j10a1n15 j10a1n15 marked this pull request as ready for review July 22, 2024 21:26
Copy link

This pull request has conflicts, please resolve those before the pull request can be reviewed.

…end/pss-chat

# Conflicts:
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/features/gui/hud/rngdropbanner/DropBannerDisplay.kt
Copy link

Conflicts have been resolved!

@Su386yt
Copy link
Member

Su386yt commented Jul 24, 2024

Could you merge upstream main just so I can see the changes easier?

@Su386yt
Copy link
Member

Su386yt commented Jul 24, 2024

ty


object PickaxeWarning {

private val pattern = Pattern.compile("(Mining Speed Boost|Pickobulus|Maniac Miner|Vein Seeker) is now available!")
private val pattern = "(Mining Speed Boost|Pickobulus|Maniac Miner|Vein Seeker|Hazardous Miner|Gemstone Infusion) is now available!".toPattern()
Copy link
Member

Choose a reason for hiding this comment

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

This should probably be repoed

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Not in this unrelated pr though

Copy link
Member

Choose a reason for hiding this comment

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

Ik

Copy link
Member

Choose a reason for hiding this comment

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

Reason its a comment not a review

@Su386yt Su386yt merged commit 469222a into PartlySaneStudios:main Jul 24, 2024
2 checks passed
@j10a1n15 j10a1n15 deleted the backend/pss-chat branch August 4, 2024 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants