-
-
Notifications
You must be signed in to change notification settings - Fork 17
Version 1.1.0 #73
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
Open
Novampr
wants to merge
10
commits into
GeyserMC:master
Choose a base branch
from
Novampr:feat/1.1.0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Version 1.1.0 #73
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
66b04f5
Fix spear animation in third-person
Novampr e6c51db
Bump manifest
Novampr 87b62c9
Bump version
Novampr a305d77
World Border
Novampr c0a4d9c
Attack Indicators
Novampr e192ca6
Preserved displays (WIP)
Novampr 43f7047
Remove world border particle files, temporarily remove attack cooldow…
Novampr 072f9a4
Fix attack cooldown
Novampr 5855a19
Remove unused files
Novampr b5ca7ec
Update hotbar cooldown size
Novampr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "ui_defs": ["ui/attack_indicator/ui.json"] | ||
| } |
182 changes: 182 additions & 0 deletions
182
src/main/resources/integratedpack/ui/attack_indicator/ui.json
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,182 @@ | ||
| // Adapted from https://github.com/AnotherSeawhite/sweepnslash/blob/main/packs/RP/ui/sweepnslash/cooldown.json | ||
|
|
||
| { | ||
| "namespace": "attack_indicator", | ||
| "cooldown_layout": { | ||
| "type": "image", | ||
| "layer": 2, | ||
| "$clip_max": 16.0, | ||
| "clips_children": false, | ||
| "clip_pixelperfect": true, | ||
| "bindings": [ | ||
| { | ||
| "binding_type": "view", | ||
| "source_control_name": "data_control", | ||
| "resolve_sibling_scope": true, | ||
| "source_property_name": "(#preserved_text - $update_string)", | ||
| "target_property_name": "#texto" | ||
| }, | ||
| { | ||
| "binding_type": "view", | ||
| "source_property_name": "(#texto - ('%.4s' * #texto))", | ||
| "target_property_name": "#texttonumber" | ||
| }, | ||
| { | ||
| "binding_type": "view", | ||
| "source_property_name": "(#texttonumber * 1)", | ||
| "target_property_name": "#ratio" | ||
| }, | ||
| { | ||
| "binding_type": "view", | ||
| "source_property_name": "(($clip_max - #ratio) / $clip_max)", | ||
| "target_property_name": "#clip_ratio" | ||
| }, | ||
| { | ||
| "binding_type": "view", | ||
| "source_property_name": "(('%.3s' * #texto) = $prefix_string)", | ||
| "target_property_name": "#visible" | ||
| } | ||
| ] | ||
| }, | ||
| // "cooldown_ready": { | ||
| // "type": "image", | ||
| // "layer": 3, | ||
| // "allow_clipping": false, | ||
| // "bindings": [ | ||
| // { | ||
| // "binding_type": "view", | ||
| // "source_control_name": "data_control", | ||
| // "resolve_sibling_scope": true, | ||
| // "source_property_name": "(#preserved_text - $update_string)", | ||
| // "target_property_name": "#texto" | ||
| // }, | ||
| // { | ||
| // "binding_type": "view", | ||
| // "source_property_name": "( (('%.1s' * (#texto - ('%.4s' * #texto))) = 't') and (('%.3s' * #texto) = $prefix_string) )", | ||
| // "target_property_name": "#visible" | ||
| // } | ||
| // ] | ||
| // }, | ||
| "cooldown_crosshair": { | ||
| "type": "panel", | ||
| "size": [ | ||
| 16, | ||
| 4 | ||
| ], | ||
| "anchor_from": "bottom_middle", | ||
| "anchor_to": "top_middle", | ||
| "$prefix_string": "crs", | ||
| "controls": [ | ||
| { | ||
| "data_control@attack_indicator.data_control": {} | ||
| }, | ||
| { | ||
| "cooldown_crosshair_layout@attack_indicator.cooldown_layout": { | ||
| "texture": "textures/geyser/ui/crosshair_attack_indicator_progress", | ||
| "alpha": 0.5, | ||
| "clip_direction": "left", | ||
| "controls": [ | ||
| { | ||
| "bar_bg": { | ||
| "type": "image", | ||
| "texture": "textures/geyser/ui/crosshair_attack_indicator_background", | ||
| "alpha": 0.5, | ||
| "layer": -1 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| // { | ||
| // "cooldown_ready_crosshair@attack_indicator.cooldown_ready": { | ||
| // "texture": "textures/cooldown_crosshair_ready", | ||
| // "alpha": 0.6, | ||
| // "controls": [ | ||
| // { | ||
| // "full_layout_with_alpha": { | ||
| // "type": "image", | ||
| // "texture": "textures/cooldown_crosshair_full", | ||
| // "alpha": 0.2 | ||
| // } | ||
| // } | ||
| // ] | ||
| // } | ||
| // } | ||
| ] | ||
| }, | ||
| "cooldown_hotbar": { | ||
| "type": "panel", | ||
| "size": [ | ||
| 18, | ||
| 18 | ||
| ], | ||
| "offset": [ | ||
| 4, | ||
| 0 | ||
| ], | ||
| "anchor_from": "right_middle", | ||
| "anchor_to": "left_middle", | ||
| "$prefix_string": "htb", | ||
| "controls": [ | ||
| { | ||
| "data_control@attack_indicator.data_control": {} | ||
| }, | ||
| { | ||
| "cooldown_hotbar_layout@attack_indicator.cooldown_layout": { | ||
| "texture": "textures/geyser/ui/hotbar_attack_indicator_progress", | ||
| "clip_direction": "down", | ||
| "controls": [ | ||
| { | ||
| "bar_bg": { | ||
| "type": "image", | ||
| "texture": "textures/geyser/ui/hotbar_attack_indicator_background", | ||
| "layer": -1 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| // { | ||
| // "cooldown_ready_hotbar@attack_indicator.cooldown_ready": { | ||
| // "texture": "textures/cooldown_hotbar_full" | ||
| // } | ||
| // } | ||
| ] | ||
| }, | ||
| "cooldown_ui": { | ||
| "type": "panel", | ||
| "$update_string": "geyseropt:cooldown:", | ||
| "size": [ | ||
| "100%", | ||
| "100%" | ||
| ], | ||
| "controls": [ | ||
| { | ||
| "cooldown_crosshair@attack_indicator.cooldown_crosshair": {} | ||
| } | ||
| ] | ||
| }, | ||
| "data_control": { | ||
| "type": "panel", | ||
| "size": [ | ||
| 0, | ||
| 0 | ||
| ], | ||
| "bindings": [ | ||
| { | ||
| "binding_name": "#tip_text", | ||
| "binding_condition": "always" | ||
| }, | ||
| { | ||
| "binding_name": "#tip_text", | ||
| "binding_name_override": "#preserved_text", | ||
| "binding_condition": "visibility_changed" | ||
| }, | ||
| { | ||
| "binding_type": "view", | ||
| "source_property_name": "(not (#tip_text = #preserved_text) and not ((#tip_text - $update_string) = #tip_text))", | ||
| "target_property_name": "#visible" | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| { | ||
| "small_chest_grid": { | ||
| "grid_dimensions": "$grid_dimensions", | ||
| "size": "$size", | ||
|
|
||
| "$grid_dimensions|default": [9, 3], | ||
| "$size|default": [162, 54], | ||
| "$container_title_copy": "$container_title", | ||
|
|
||
| "variables": [ | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§1§r') = $container_title_copy))", | ||
| "$grid_dimensions": [9, 1], | ||
| "$size": [162, 18] | ||
| }, | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§2§r') = $container_title_copy))", | ||
| "$grid_dimensions": [9, 2], | ||
| "$size": [162, 36] | ||
| }, | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§3§r') = $container_title_copy))", | ||
| "$grid_dimensions": [9, 3], | ||
| "$size": [162, 54] | ||
| } | ||
| ] | ||
| }, | ||
| "large_chest_grid": { | ||
| "grid_dimensions": "$grid_dimensions", | ||
| "size": "$size", | ||
|
|
||
| "$grid_dimensions|default": [9, 6], | ||
| "$size|default": [162, 108], | ||
| "$container_title_copy": "$container_title", | ||
|
|
||
| "variables": [ | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§4§r') = $container_title_copy))", | ||
| "$grid_dimensions": [9, 4], | ||
| "$size": [162, 72] | ||
| }, | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§5§r') = $container_title_copy))", | ||
| "$grid_dimensions": [9, 5], | ||
| "$size": [162, 90] | ||
| }, | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§6§r') = $container_title_copy))", | ||
| "$grid_dimensions": [9, 6], | ||
| "$size": [162, 108] | ||
| } | ||
| ] | ||
| }, | ||
|
|
||
| "small_chest_panel/root_panel": { | ||
| "size": "$size", | ||
|
|
||
| "$size|default": [176, 166], | ||
| "$container_title_copy": "$container_title", | ||
|
|
||
| "variables": [ | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§1§r') = $container_title_copy))", | ||
| "$size": [176, 130] | ||
| }, | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§2§r') = $container_title_copy))", | ||
| "$size": [176, 148] | ||
| }, | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§3§r') = $container_title_copy))", | ||
| "$size": [176, 166] | ||
| } | ||
| ] | ||
| }, | ||
|
|
||
| "large_chest_panel/root_panel": { | ||
| "$size|default": [176, 220], | ||
|
|
||
| "size": "$size", | ||
|
|
||
| "$container_title_copy": "$container_title", | ||
|
|
||
| "variables": [ | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§4§r') = $container_title_copy))", | ||
| "$size": [176, 184] | ||
| }, | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§5§r') = $container_title_copy))", | ||
| "$size": [176, 202] | ||
| }, | ||
| { | ||
| "requires": "(not (($container_title_copy - '§z§6§r') = $container_title_copy))", | ||
| "$size": [176, 220] | ||
| } | ||
| ] | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need the commented out blocks? If not can we remove
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not necessarily, but when we fix the "hover over" entity in Geyser we can then implement the ready cooldown, so I'd prefer we keep it for whenever that gets fixed