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

Backend: Remove more neu dependent code !!! #2738

Merged
merged 38 commits into from
Nov 1, 2024
Merged

Backend: Remove more neu dependent code !!! #2738

merged 38 commits into from
Nov 1, 2024

Conversation

NopoTheGamer
Copy link
Contributor

@NopoTheGamer NopoTheGamer commented Oct 14, 2024 •
edited by hannibal002
Loading

Dependencies

What

Remove more required places for neu

Images

image

Changelog Technical Details

  • Added PlatformUtils.isNeuLoaded(). - nopo
    • Moved NEU events to a wrapper.
    • Added the ability to require NEU to load a module.
    • Integrated the horse mixin from NEU. It is required for the game to launch.

CalMWolfs and others added 25 commits October 1, 2024 11:02
@CalMWolfs
Backend: Add skyhanni notifications
2aea746
@CalMWolfs
finish and use SkyHanniNotification
50e7a93
@CalMWolfs
display more info in the notification
faa5c81
@CalMWolfs
rename variable
3216ae7
@CalMWolfs
dont use neu button
6461aa4
@CalMWolfs
Merge branch 'refs/heads/beta' into buttoning
b1067b5 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
@CalMWolfs
Merge branch 'refs/heads/beta' into notifications
5c9f15e 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@CalMWolfs
use new command system
154319e
@CalMWolfs
Merge branch 'refs/heads/beta' into notifications
9cf9c02
@CalMWolfs
use new event name
68409ee
@NopoTheGamer
this code is nonsense rn but it will be useful in the future
1a9f9f3
@NopoTheGamer
neuapi
a5b7425
@NopoTheGamer
pv
68ed9e4
@NopoTheGamer
delete fix neu heavy pearls (neu fixed the issue like 1 week later)
c50865e
@NopoTheGamer
dont use neu for locraw + locraw command
37c092c
@NopoTheGamer
add Pseudo to neu mixin
994e440
@NopoTheGamer
add checks when using neu config
6767f77
@NopoTheGamer
calculator (this is probably weird behaviour but wtv rn
da69890
@NopoTheGamer
forgot to remove config option for the pearls
6bb14d8
@NopoTheGamer
add check to neu has focus, didnt do the todo yet
d4d3a19
@NopoTheGamer
Merge remote-tracking branch 'refs/remotes/CalMWolfs/buttoning' into …
d738048 
…remove-neus

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/HypixelCommands.kt
@NopoTheGamer
Merge remote-tracking branch 'refs/remotes/CalMWolfs/notifications' i…
9c6d984 
…nto remove-neus
@NopoTheGamer
change horse mixin to be after neu (so never ?)
9e0278c
@NopoTheGamer
add sh module flag to only load if neu, rn used for using neu events
8b99634
@NopoTheGamer
fix horse again
15ee619
@github-actions github-actions bot added Backend A backend pull request that will be merged soon Wrong Title/Changelog There is an error in the title or changelog labels Oct 14, 2024
@github-actions GitHub Actions
Copy link

I have detected some issues with your pull request:

Body issues:
Change should end with a full stop in text: Moved NEU events to a wrapper
Change should end with a full stop in text: Added the ability to require neu to load a module
Change should end with a full stop in text: Stole the horse mixin from neu. is required for the game to launch
Change should end with a full stop in text: This was useless

Please fix these issues. For the correct format, refer to the pull request template.

@github-actions github-actions bot removed the Wrong Title/Changelog There is an error in the title or changelog label Oct 14, 2024
@hannibal002 hannibal002 added this to the Version 0.28 milestone Oct 14, 2024
hannibal002
hannibal002 requested changes Oct 17, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I can't reproduce the fix in NEU 2.4.0! Please revert the removal of the fix in SH.

I've waited 30 seconds after leaving the matriarch, and the heavy pearls are still on the to-do list.
image

@hannibal002
Copy link
Owner

hannibal002 commented Oct 17, 2024 •
edited
Loading

Update: When moving close to matriarch after picking it up, the to-do entry finally vanishes.
But the SkyHanni fix is still fixing NEU's detection not working without moving close.

@CalMWolfs
Copy link
Collaborator

Update: When moving close to matriarch after picking it up, the to-do entry finally vanishes. But the SkyHanni is still fixing NEU's detection not working without moving close.

I believe NotEnoughUpdates/NotEnoughUpdates#1396 fixes it. But yeah, this should stay for now i guess. We can use the new requiresNeu annotation for this class so it shouldnt be too much of a problem, and then remove this at a later point

@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 Oct 18, 2024
@hannibal002 hannibal002 added test and removed test labels Oct 18, 2024
@CalMWolfs
Merge branch 'refs/heads/beta' into fork/NopoTheGamer/remove-neus
cf0964d 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 19, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

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

@NopoTheGamer
Merge remote-tracking branch 'refs/remotes/hannibald/beta' into remov…
357687f 
…e-neus

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Oct 22, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions GitHub Actions
Copy link

One or more Detekt Failures were detected:

  • EstimatedItemValue.kt#L3: Imports must be ordered in lexicographic order without any empty lines in-between with "java", "javax", "kotlin" and aliases in the end. This should then be followed by pre-processed imports.
  • EstimatedItemValue.kt#L30: Unused import

@CalMWolfs CalMWolfs requested a review from hannibal002 October 26, 2024 12:04
hannibal002
hannibal002 requested changes Oct 27, 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.

As Long as the latest NEU version does not remove the TODO entry for me, the fix in SH stays. Please revert the removal for now @NopoTheGamer

@CalMWolfs CalMWolfs requested a review from hannibal002 October 27, 2024 22:32
@CalMWolfs
Copy link
Collaborator

As Long as the latest NEU version does not remove the TODO entry for me, the fix in SH stays. Please revert the removal for now @NopoTheGamer

pearls are back

@hannibal002 hannibal002 merged commit b60c8c0 into hannibal002:beta Nov 1, 2024
6 checks passed
@github-actions github-actions bot removed Soon This Pull Request will be merged within the next couple of betas Backend A backend pull request that will be merged soon labels Nov 1, 2024
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

@hannibal002 hannibal002 hannibal002 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0.0 (old Version 0.28)
Development

Successfully merging this pull request may close these issues.
3 participants
@NopoTheGamer @hannibal002 @CalMWolfs