Skip to content

Keyboard #659

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
Open
wants to merge 24 commits into
base: dev/0.8
Choose a base branch
from
Open

Keyboard #659

wants to merge 24 commits into from

Conversation

SirEndii
Copy link
Member

@SirEndii SirEndii commented Sep 23, 2024 •
edited
Loading

  • Please check if the PR fulfills these requirements
  • The commit message are well described
  • Docs have been added / updated
  • All changes have fully been tested

  • What kind of change does this PR introduce? (Bug fix, feature, ...)
    Feature

  • What is the new behavior (if this is a feature change)?
    Added the keyboard item. An item which can be linked to a computer. A user can now right click the item to unlock their mouse, they can now freely type while the typed characters are send to the linked computer. Will also be a module for the smart glasses.

  • Does this PR introduce a breaking change? (What changes might users need to make in their scripts due to this PR?)
    No

  • Other information:

@SirEndii SirEndii self-assigned this Sep 23, 2024
@SirEndii SirEndii added enhancement New feature or request 1.19x labels Sep 23, 2024
@SirEndii SirEndii added this to the 0.8r milestone Sep 23, 2024
@SirEndii SirEndii changed the title [IntelligenceModding/Advanced-Peripherals-Features#59] Keyboard item and simple screen to unlock the mouse Keyboard Sep 23, 2024
@SirEndii
Copy link
Member Author

So the keyboard works now
I can bound it to a computer, right click it in the air and start typing. Every key stroke, key presses and releases are synced to the terminal

I now want to remove JEI from the keyboard screen and place a little info text at the top

The last thing I need to do is to implement this as a smart glasses module

@SirEndii
The keyboard is now a working module, it currently uses the hotkey mo…
5af40a8 
…dule keybind. I will see what I will do with the hotkey module or if I will create a new Keybind

I've created two new nbt tags to bind the module to the glasses to sync that to the container, I am not sure if there is maybe a better way, but it works
@SirEndii
Mouse events for the keyboard module
b94b8be
@SirEndii
Fixed an issue where the keyboard does not bound to the glasses when …
9ba1214 
…it was bound to different glasses before
@SirEndii
Render a little info text when the player is using the keyboard
e8f70d7
@SirEndii
Preven JEI/REI/EMI from rendering in the keyboard screen
1b147a3
@SirEndii
Copy link
Member Author

I think everything is done now. Mouse and keyboard events are working, I got the little info text rendered, JEI does not render anymore and everything works fine as a glasses module

@SirEndii SirEndii marked this pull request as ready for review September 30, 2024 10:21
@SirEndii SirEndii requested a review from zyxkad September 30, 2024 10:22
zyxkad
zyxkad reviewed Oct 21, 2024
View reviewed changes
Copy link
Collaborator

@zyxkad zyxkad left a comment

Choose a reason for hiding this comment

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

Overall looks good, just have some detail need to deal with

@SirEndii
Copy link
Member Author

Sorry to annoy you @SquidDev, just asking you because of #650 (comment)

I used a piece of the TerminalWidget implementation for our keyboard screen. Just asking if this is okay
See
https://github.com/IntelligenceModding/AdvancedPeripherals/pull/659/files#diff-6374267185184dd9bdd6868cb47752c688a105088d0063d0c5bf7992b4e10ec9R19

And maybe you can answer the two comments related to that from zyxkad

@SquidDev
Copy link
Contributor

It might be easier to copy what NoTermComputerScreen does, and just create a Terminal but never render it. Plethora's keyboard UI actually just subclasses NoTermComputerScreen directly.

@SirEndii
Copy link
Member Author

It might be easier to copy what NoTermComputerScreen does, and just create a Terminal but never render it. Plethora's keyboard UI actually just subclasses NoTermComputerScreen directly.

Thank you, I didn't see that
That would be simpler

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 16, 2025 •
edited
Loading

Build Preview

badge

You can find files attached to the below linked Workflow Run URL (Logs).

Name Link
Commit d018a9b
Logs https://github.com/IntelligenceModding/AdvancedPeripherals/actions/runs/13958514776
Jar Files AdvancedPeripherals PR 659
Expires At 2025-06-17T23:15:39Z

@SirEndii SirEndii requested a review from zyxkad January 16, 2025 03:07
zyxkad
zyxkad requested changes Jan 17, 2025
View reviewed changes
SirEndii and others added 3 commits January 17, 2025 22:48
@SirEndii @zyxkad
Sort ClientRegistry.java
5e439b9 
Co-authored-by: Kevin Z <[email protected]>
Signed-off-by: Srendi <[email protected]>
@SirEndii
Merge branch 'dev/0.8' into feat/keyboard
a7c5984 
# Conflicts:
#	build.gradle
#	src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2
#	src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
#	src/generated/resources/assets/advancedperipherals/lang/en_us.json
#	src/main/java/de/srendi/advancedperipherals/common/data/EnUsLanguageProvider.java
#	src/main/java/de/srendi/advancedperipherals/common/setup/APItems.java
@SirEndii
Add language entries
f5efd86
@SirEndii SirEndii mentioned this pull request Jan 18, 2025
Open
14 tasks
@scmcgowen scmcgowen mentioned this pull request Jan 18, 2025
Draft
zyxkad and others added 6 commits March 15, 2025 13:24
@zyxkad
Merge branch 'dev/0.8' of https://github.com/IntelligenceModding/Adva…
25cb800 
…ncedPeripherals into player-rotate-handle-feature
@zyxkad
make keyboard based on computer ID instead of position
256cf0e
@zyxkad
run runData
5251139
@zyxkad
implement keyboard mouse capture mode
3549dd9 
- fix keyboard container will keep reopen whenever holding G
- rename glassesKeyPressed event to glasses_key_pressed
- fix JEI will shown on keyboad container screen
@zyxkad
fix styles
d6dd79b
@SirEndii
Merge pull request #719 from zyxkad/player-rotate-handle-feature
21e7aeb 
Player rotate handle feature
@zyxkad
make lock final
58a92cd 
Signed-off-by: Kevin Z <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zyxkad zyxkad zyxkad requested changes

Assignees

@SirEndii SirEndii

Labels
1.19x enhancement New feature or request
Projects
Advanced Peripherals
Status: Needs testing/review
Milestone
0.8r
Development

Successfully merging this pull request may close these issues.
3 participants
@SirEndii @SquidDev @zyxkad