Improved AimAssist #100
Closed
Improved AimAssist #100
Conversation
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
0x3C50
requested changes
Feb 20, 2024
Contributor
0x3C50
left a comment
0x3C50
left a comment
There was a problem hiding this comment.
code style and a few descriptions, otherwise great
| .description("Where to aim") | ||
| .get()); | ||
| final DoubleSetting aimHeight = this.config.create(new DoubleSetting.Builder(1).name("Aim Height") | ||
| .description("Where to aim (in %)") |
Contributor
There was a problem hiding this comment.
should probably elaborate on what that % affects
| .description("Whether or not to aim instantly instead of smoothly") | ||
| .get()); | ||
| final BooleanSetting aimRandom = this.config.create(new BooleanSetting.Builder(false).name("Aim random") | ||
| .description("Whether or not the laziness should have randomness") |
Contributor
There was a problem hiding this comment.
"Randomize speed when aiming"
| .get()); | ||
| RangeSetting.Range defaultValue = new RangeSetting.Range(1, 100); | ||
| final RangeSetting aimRandomness = this.config.create(new RangeSetting.Builder(defaultValue).name("Randomness") | ||
| .description("The amount of randomness the lazyness should have") |
Contributor
There was a problem hiding this comment.
"How strongly to affect speed when randomizing"
| if (!aimInstant.getValue()) { | ||
| if(aimMode.getValue() == AimMode.Top) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getPos().add(0, (le.getHeight() / 1.3d), 0), (float) (modifiedLaziness)); |
Contributor
There was a problem hiding this comment.
should this look at the head of an entity? in which case getEyePos()
Comment on lines
215
to
240
| } else { | ||
| if(aimMode.getValue() == AimMode.Top) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 1.3d), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Middle) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 2d), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Bottom) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 4d), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Custom) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 100) * aimHeight.getValue(), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
surely this can be simplified down to avoid duplicate code
Comment on lines
242
to
287
| else if (!aimRandom.getValue()) | ||
| { | ||
| if (!aimInstant.getValue()) { | ||
| if(aimMode.getValue() == AimMode.Top) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getPos().add(0, (le.getHeight() / 1.3d), 0), (float) (laziness.getValue() + 0)); | ||
| } | ||
| if(aimMode.getValue() == AimMode.Middle) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getPos().add(0, (le.getHeight() / 2d), 0), (float) (laziness.getValue() + 0)); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Bottom) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getPos().add(0, (le.getHeight() / 4d), 0), (float) (laziness.getValue() + 0)); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Bottom) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getPos().add(0, (le.getHeight() / 100) * aimHeight.getValue(), 0), (float) (laziness.getValue() + 0)); | ||
| } | ||
| } else { | ||
| if(aimMode.getValue() == AimMode.Top) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 1.3d), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Middle) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, le.getHeight() / 2d, 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Bottom) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, le.getHeight() / 4d, 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Custom) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 100) * aimHeight.getValue(), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
same code but with a different variable, you can just use the modifiedLaziness and only change it when randomness is enabled
Author
|
Ok fixed stuff now |
Author
|
By the way the createrelease.sh doesn't work, at least on mac |
0x3C50
requested changes
Feb 20, 2024
Contributor
0x3C50
left a comment
0x3C50
left a comment
There was a problem hiding this comment.
took a proper look, didn't notice these things at first when going over the pr on mobile.
if you have a lot of duplicate code with only one variable or argument changing, it's best to remove the duplicate code and only actually change that one part. both of the if chains have a lot of duplicate code where you could just modify the position to look at. everything else is the same
Comment on lines
227
to
256
| if(aimMode.getValue() == AimMode.Top) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 1.3d), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Middle) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 2d), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Bottom) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 4d), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Custom) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getPos().add(0, (le.getHeight() / 100) * aimHeight.getValue(), 0)); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } | ||
| else if (aimMode.getValue() == AimMode.Eyes) | ||
| { | ||
| Rotation py = Rotations.getPitchYaw(le.getEyePos()); | ||
| Objects.requireNonNull(CoffeeMain.client.player).setPitch(py.getPitch()); | ||
| CoffeeMain.client.player.setYaw(py.getYaw()); | ||
| } |
Contributor
There was a problem hiding this comment.
still code duplicates, you can use an enhanced switch here:
Rotation py = switch (aimMode.getValue()) {
case AimMode.Top -> ...;
case AimMode.Middle -> ...;
...
}
// use py
Comment on lines
206
to
225
| if(aimMode.getValue() == AimMode.Top) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getPos().add(0, (le.getHeight() / 1.3d), 0), (float) (modifiedLaziness)); | ||
| } | ||
| if(aimMode.getValue() == AimMode.Middle) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getPos().add(0, (le.getHeight() / 2d), 0), (float) (modifiedLaziness)); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Bottom) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getPos().add(0, (le.getHeight() / 4d), 0), (float) (modifiedLaziness)); | ||
| } | ||
| else if(aimMode.getValue() == AimMode.Custom) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getPos().add(0, (le.getHeight() / 100) * aimHeight.getValue(), 0), (float) (modifiedLaziness)); | ||
| } | ||
| else if (aimMode.getValue() == AimMode.Eyes) | ||
| { | ||
| Rotations.lookAtPositionSmooth(le.getEyePos(), (float) (modifiedLaziness)); | ||
| } |
Contributor
There was a problem hiding this comment.
enhanced switch might be best here too
|
|
||
| void aimAtTarget() { | ||
|
|
||
| double modifiedLaziness = laziness.getValue() + 0; |
Contributor
There was a problem hiding this comment.
this is a double, but any usages are casted to floats. probably better to make this a float and use Random#nextFloat for the offset
Author
|
all right imma look into this tomorrow |
Author
|
ok i really haven't had time to do this so I will do it after my exams (i will work on it next thursday) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Added more smoothness, randomness and an option to change where to aim.
Feedback is appreciated