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: SBA style Enchant Parsing #654

Merged
merged 32 commits into from
Apr 25, 2024
Merged

Feature: SBA style Enchant Parsing #654

merged 32 commits into from
Apr 25, 2024

Conversation

VixidDev
Copy link
Contributor

@VixidDev VixidDev commented Oct 31, 2023 •
edited by hannibal002
Loading

Enchant Parsing like SBA. Has settings for:

  • Removing Vanilla Enchants on top of tooltip
  • Removing Enchant Descriptions
  • Enchant formats:
    • Normal (as Hypixel provides)
    • Compressed (Forces 3 enchants per line)
    • Stacked (Forces 1 enchant per line)
  • Color settings for
    • Max level enchants
    • Great level enchants
    • Good level enchants
    • Poor level enchants
  • Color of the proceeding comma

Also parses the tooltips shown in chat from /show or /showitem. Requires #46 to be merged.

Changelog New Features

  • Added SBA style Enchant Parsing. - Vixid
    • Option to remove vanilla enchants in tooltip.
    • Option to remove enchant descriptions.
    • Option to change enchant formatting.
    • Also parses tooltips from /show.

@VixidDev VixidDev marked this pull request as draft October 31, 2023 23:22
@VixidDev VixidDev marked this pull request as ready for review November 1, 2023 18:45
@hannibal002 hannibal002 added this to the Version 0.22 milestone Nov 1, 2023
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 5, 2023
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 5, 2023

This pull request has conflicts with the base branch. Please resolve those so we can evaluate the pull request.

@VixidDev
Merge branch 'beta' into enchant-parsing
e0d6d10 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/config/Features.java
@VixidDev
Move config to alphabetical position
6207fea
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 5, 2023
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 5, 2023

Conflicts have been resolved! 🎉

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

@VixidDev
Merge branch 'beta' into enchant-parsing
6caad85 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/Features.java
@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 Nov 24, 2023
@hannibal002 hannibal002 added Soon This Pull Request will be merged within the next couple of betas and removed Soon This Pull Request will be merged within the next couple of betas labels Dec 12, 2023
@jani270 jani270 modified the milestones: Version 0.22, Version 0.23 Dec 14, 2023
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Jan 21, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 15, 2024
@hannibal002 hannibal002 removed the Soon This Pull Request will be merged within the next couple of betas label Mar 23, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 24, 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 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Mar 28, 2024
@hannibal002
Merge branch 'beta' into fork/enchant-parsing
24eb40c 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/config/Features.java
@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 30, 2024
@VixidDev
Merge branch 'beta' into enchant-parsing
d66069f 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/config/Features.java
@VixidDev
Use Property's in config, use new chat component for chat hover, move…
d2009c1 
…d config into GUI category
@VixidDev
Merge remote-tracking branch 'origin/enchant-parsing' into enchant-pa…
2489fa8 
…rsing

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/Features.java
hannibal002
hannibal002 requested changes Apr 23, 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.

This does not cache correctly (I've hovered over the terminator previously)
Also, this does not reset when disabling the main toggle)
image

src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchants.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt Outdated Show resolved Hide resolved
@hannibal002
Copy link
Owner

Item lore has sometimes bugs when inside neu storage (not important enough to stop this pr)

@hannibal002 hannibal002 merged commit f3b3b44 into hannibal002:beta Apr 25, 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 25, 2024
@VixidDev VixidDev deleted the enchant-parsing branch April 25, 2024 14:45
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.
3 participants
@VixidDev @hannibal002 @jani270