Add Speed Presets for configurable speed settings #1111
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Introduced a Speed Presets system with customizable presets for the rancher boots. Added a GUI to manage presets and integrated support for the `setmaxspeed` command, and the sign-editor to use these presets. Besides all of that, refactored item protection rendering logic to show it everywhere, where applicable, and render it in front of the item, as well as updated the texture being used.
I apologize for the changes, since I didn't know that the texture was applied elsewhere. This commit reverts all the changes to the size of the texture and the way it is rendered, to hopefully prevent any issues.
kevinthegreat1
requested changes
Dec 29, 2024
Comment on lines
14
to
15
|
|
||
| @ModifyExpressionValue(method = "drawCooldownProgress", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/ItemCooldownManager;getCooldownProgress(Lnet/minecraft/item/ItemStack;F)F")) |
There was a problem hiding this comment.
There's literally nothing changed here?
Comment on lines
100
to
101
| @Shadow | ||
| private boolean touchIsRightClickDrag; |
There was a problem hiding this comment.
Why is this shadowed?
| * | ||
| * @return true if the state has been modified; false otherwise. | ||
| */ | ||
| public boolean hasBeenChanged() { |
There was a problem hiding this comment.
This logic has some problems, where an entry changed and then changed back to the original would still be marked as changed. In general, you need a validation method that checks if all entries are the same. I'd suggest looking at ShortcutsConfigListWidget#hasChanges.
src/main/java/de/hysky/skyblocker/skyblock/speedPreset/SpeedPresetListWidget.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/speedPreset/SpeedPresetListWidget.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/speedPreset/SpeedPresets.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/speedPreset/SpeedPresetsScreen.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/speedPreset/SpeedPresetsScreen.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/speedPreset/SpeedPresetsScreen.java
Outdated
Show resolved
Hide resolved
Comment on lines
53
to
65
| var presets = SpeedPresets.getInstance().getPresetCount(); | ||
| // Accounting 1 for the title entry. | ||
| var children = children().size() - 1; | ||
| if (children < presets) return true; | ||
|
|
||
| children = 0; | ||
| for (var child : children()) { | ||
| if (child.hasBeenModified()) return true; | ||
| if (child instanceof SpeedPresetEntry entry) { | ||
| children = entry.isEmpty() ? children : children + 1; | ||
| } | ||
| } | ||
| return children != presets; |
There was a problem hiding this comment.
Suggested change
| var presets = SpeedPresets.getInstance().getPresetCount(); | |
| // Accounting 1 for the title entry. | |
| var children = children().size() - 1; | |
| if (children < presets) return true; | |
| children = 0; | |
| for (var child : children()) { | |
| if (child.hasBeenModified()) return true; | |
| if (child instanceof SpeedPresetEntry entry) { | |
| children = entry.isEmpty() ? children : children + 1; | |
| } | |
| } | |
| return children != presets; | |
| return children().stream().anyMatch(AbstractEntry::hasBeenModified) || children().stream().filter(SpeedPresetEntry.class::isInstance).map(SpeedPresetEntry.class::cast).filter(entry -> !entry.isEmpty()).count() != SpeedPresets.getInstance().getPresetCount(); |
There was a problem hiding this comment.
This results into two separate loops although it could be done it one
LifeIsAParadox
added
changes requested
There was a problem hiding this comment.
Really good api here btw.
Yeah, I shouldn't have included it in this PR in the first place, but I'll try to revert the changes and use the old texture |
…esetsScreen.java Co-authored-by: Kevin <[email protected]>
LifeIsAParadox
added
reviews needed
…esetListWidget.java Co-authored-by: Kevin <[email protected]>
…esets.java Co-authored-by: Kevin <[email protected]>
…esetsScreen.java Co-authored-by: Kevin <[email protected]>
…esetsScreen.java Co-authored-by: Kevin <[email protected]>
…esetListWidget.java Co-authored-by: Kevin <[email protected]>
…esets.java Co-authored-by: Kevin <[email protected]>
…esets.java Co-authored-by: Kevin <[email protected]>
…esets.java Co-authored-by: Kevin <[email protected]>
…esetListWidget.java Co-authored-by: Kevin <[email protected]>
…esets.java Co-authored-by: Kevin <[email protected]>
…esets.java Co-authored-by: Kevin <[email protected]>
Removed the `hasBeenModified` flag, and replaced it with direct comparisons of initial and current values.
Replaced LinkedHashMap with Object2IntMap for efficiency and consistency in managing speed presets. Adjusted related methods and logic to accommodate the new data structure. Updated SpeedPresetListWidget to handle changes and comparisons using the revised map implementation.
kevinthegreat1
approved these changes
Dec 29, 2024
LifeIsAParadox
added
merge me please
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduced a Speed Presets system with customizable presets for the rancher boots. Added a GUI to manage presets and integrated support for the
setmaxspeedcommand, and the sign-editor to use these presets.Besides all of that, refactored item protection rendering logic to show it everywhere, where applicable, and render it in front of the item, as well as updated the texture being used.