Smooth AOTE #963

olim88 · 2024-08-28T10:06:52Z

adds smoothing when using the aspect of the end or other teleports

it works out where hypixel is sending the player based on the distance they are going to teleport and then looks at the players ping and uses this as a goal to be end the predicted position in the time of the players ping (when they will receive a teleport packet from hypixel) then there is just a mixed to the Camera class that moves it to the position corresponding to how far though the allotted me the player is.

tests

only tested with aspect of the void and aspect of the end. however this should work with everything else

small bugs

the prediction of where the player is going to be teleported to is not perfect if there are blocks in the way. (if this is fixed it needs to be fixed in the overlay as well as this is also not always right)
manna can sometimes be lagged behind client side so sometimes the animation is played when there is not enough manna to teleport

x-yingcan-x · 2024-08-28T12:12:37Z

I tried a bit and found bugs

click too fast cause the animation break, the anim for 1st tp cut off and 2nd anim not play.
Etherwarp logic incorrectly, when enableEtherTransmission is false but enableInstantTransmission is true, Etherwarp will use anim of instant tp instead.
wither impact tp doesnt check if it has wither impact.

always send ping packet regardless What server you're in/Is in Skyblock/Are all related settings off

viciscat

Very epic as usual

viciscat · 2024-08-28T16:30:31Z

src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java

+    private boolean shouldShowPacketSizeAndPingCharts(DebugHud instance, Operation<Boolean> original) {
+        //make the f3+3 screen always send ping packets even when closed
+        //this is needed to make smooth AOTE work
+        return true;


Maybe only on skyblock? To avoid spamming other servers and using more bandwidth.

viciscat · 2024-08-28T16:36:53Z

src/main/resources/assets/skyblocker/lang/en_us.json

+  "skyblocker.config.uiAndVisuals.smoothAOTE": "Smooth AOTE",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.@Tooltip": "Smooths out teleporting with right click teleport ability's",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableEtherTransmission": "Enable Ether Transmission",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableInstantTransmission": "Enable Instant Transmission ",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableSinrecallTransmission": "Enable Sinrecall Transmission",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableWeirdTransmission": "Enable Weird Transmission",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableWitherImpact": "Enable Wither Impact",


specifying which item(s) that is in tooltip for smoof brained people like me would be nice

viciscat · 2024-08-28T16:40:30Z

src/main/java/de/hysky/skyblocker/skyblock/SmoothAOTE.java

+    private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
+
+    private static final Pattern MANA_LORE = Pattern.compile("Mana Cost: (\\d+)");
+    private static final long maxTeleportTime = 1000;


UPPER_SNAKE_CASE like the static final variable just above

x-yingcan-x · 2024-08-29T00:09:02Z

Critical Issue: (no location check) Works in F7/M7 Boss Fight / Glacite Minshaft or anywhere that blocked teleport

olim88 · 2024-08-29T11:02:43Z

Critical Issue: (no location check) Works in F7/M7 Boss Fight / Glacite Minshaft or anywhere that blocked teleport

i have hopefully disabled it in those locations but i can not find a list of locations were its not allowed so i do not know if there are any more places like that

x-yingcan-x · 2024-08-29T11:44:34Z

i have hopefully disabled it in those locations but i can not find a list of locations were its not allowed so i do not know if there are any more places like that

I suddenly think of what I forgot.

Jungle Temple in Crystal Hollows
Teleport Maze Puzzle/Boulder Puzzle/Trap Room in Dungeon
While doing parkour and Item Abilities is Disabled

x-yingcan-x · 2024-08-29T13:54:13Z

strange, Latest build crashes immediately.
latest.log

viciscat · 2024-08-29T14:07:21Z

ah, olim goofed a mixin. I can quickly commit a fix if olim doesn't have time

olim88 · 2024-08-29T14:12:46Z

ah, olim goofed a mixin. I can quickly commit a fix if olim doesn't have time

Sure I probably can't get to fix this for at least a few hours

x-yingcan-x · 2024-08-30T11:28:20Z

src/main/java/de/hysky/skyblocker/skyblock/SmoothAOTE.java

+            return false;
+        } else if (Utils.getLocation() == Location.PRIVATE_ISLAND && !Utils.getIslandArea().equals("⏣ Your Island")) { //do not allow it when visiting
+            return false;
+        } else if (Utils.getLocation() == Location.PRIVATE_ISLAND && !Utils.getIslandArea().equals("⏣ Your Island")) { //do not allow it when visiting garden


forget? or I misunderstand something?

forget. i was going to do the same check for the garden the realised it was not as easy. oops

basics working just needs lots of polish

now constantly monitors ping and makes the teleport try to last as long as last ping packet recived

add raycast so predicted camera can not go though walls. could use improvement this is not how it is done exactly on hypixels side

and update settings

there is still debug stuff in this commit

still debug stuff in

still debug

still in debug

still debug

olim88 · 2024-09-14T19:30:21Z

I have re written the raycast to be more like hypixel. it seams to be correct 95+% of the time now

src/main/java/de/hysky/skyblocker/skyblock/SmoothAOTE.java

src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java

src/main/java/de/hysky/skyblocker/skyblock/SmoothAOTE.java

kevinthegreat1 · 2024-09-15T04:58:44Z

src/main/java/de/hysky/skyblocker/skyblock/SmoothAOTE.java

+        }
+        long gap = System.currentTimeMillis() - startTime;
+        //make sure the player is actually getting teleported if not disable teleporting until they are teleported again
+        if (System.currentTimeMillis() - lastTeleportTime > 1000) {


Actually, it might make sense to use ping here? Maybe two times so it's not too strict. Like this:

Suggested change

if (System.currentTimeMillis() - lastTeleportTime > 1000) {

if (System.currentTimeMillis() - lastTeleportTime > Math.min(2 * lastPing, MAX_TELEPORT_TIME)) {

AzureAaron · 2024-09-15T05:33:41Z

src/main/resources/assets/skyblocker/lang/en_us.json

@@ -765,6 +765,19 @@

  "skyblocker.config.uiAndVisuals.showEquipmentInInventory": "Show Equipment in Inventory",

+  "skyblocker.config.uiAndVisuals.smoothAOTE": "Smooth AOTE",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.@Tooltip": "Smooths out teleporting with right click teleport ability's",


AzureAaron · 2024-09-15T05:34:10Z

src/main/resources/assets/skyblocker/lang/en_us.json

+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableSinrecallTransmission": "Enable Sinrecall Transmission",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableSinrecallTransmission.@Tooltip": "for: Sinseeker Scythe",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableWeirdTransmission": "Enable Weird Transmission",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableWeirdTransmission.@Tooltip": "for: Aspect of the Leech 1 and 2",


Do we need to mention the AOTL variants? probably doesn't matter

AzureAaron · 2024-09-15T05:35:05Z

src/main/resources/assets/skyblocker/lang/en_us.json

+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableWeirdTransmission": "Enable Weird Transmission",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableWeirdTransmission.@Tooltip": "for: Aspect of the Leech 1 and 2",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableWitherImpact": "Enable Wither Impact",
+  "skyblocker.config.uiAndVisuals.smoothAOTE.enableWitherImpact.@Tooltip": "for: Necron Blade, Hyperion, Scylla, Valkyrie",


For: Necron's Blade, Hyperion, Astraea, Scylla, and Valkyrie.

AzureAaron · 2024-09-15T05:36:11Z

src/main/resources/assets/skyblocker/lang/en_us.json

Some of the sentences don't start with capitols, need periods at the end. Some option a names/descriptions have trailing space too.

AzureAaron · 2024-09-15T05:36:32Z

src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java

+        SmoothAOTE.playerTeleported();
+    }
+
+    @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/DebugHud;shouldShowPacketSizeAndPingCharts()Z"))


should be an @ModifyExpressionValue

AzureAaron · 2024-09-15T05:36:55Z

src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java

+    private boolean shouldShowPacketSizeAndPingCharts(DebugHud instance, Operation<Boolean> original) {
+        //make the f3+3 screen always send ping packets even when closed
+        //this is needed to make smooth AOTE work
+        if (Utils.isOnSkyblock()) {


Should also check for smoothing being enabled

LifeIsAParadox added the reviews needed This PR needs reviews label Aug 28, 2024

AzureAaron added the new feature This issue or PR is a new feature label Aug 28, 2024

viciscat reviewed Aug 28, 2024

View reviewed changes

AzureAaron added this to the 1.23.0 milestone Aug 28, 2024

x-yingcan-x reviewed Aug 30, 2024

View reviewed changes

AzureAaron added the merge conflicts This PR has merge conflicts that need solving. label Sep 3, 2024

olim88 force-pushed the smoothAOTE branch from 98b5322 to b452f7a Compare September 4, 2024 14:54

LifeIsAParadox removed the merge conflicts This PR has merge conflicts that need solving. label Sep 4, 2024

LifeIsAParadox added merge conflicts This PR has merge conflicts that need solving. and removed reviews needed This PR needs reviews labels Sep 14, 2024

olim88 added 13 commits September 14, 2024 20:10

init commit

f0feb8b

basics working just needs lots of polish

add setting and base teleport time on ping

188a62c

now constantly monitors ping and makes the teleport try to last as long as last ping packet recived

add settings for each wepon type and work with each of them

1d8eaf7

add raycast

d3ae3fa

add raycast so predicted camera can not go though walls. could use improvement this is not how it is done exactly on hypixels side

cheak the players mana before assuming they can teleport

1f1163d

remove un needed setting

aa37c16

and update settings

add java docs and 3rd person check

624cead

clean

4325aa3

fix 3rd person check

0a8f18d

apply suggested changes

9ca11ac

do not allow when invalid location

8ccc907

fix etherwarp logic using wrong tp

9f60637

add tooltips to options

7cc8085

olim88 added 15 commits September 14, 2024 20:10

fix multiple teleports when looking at a block

fafe6c2

there is still debug stuff in this commit

hopefully improve raycast and add allowed blocks

95e6984

still debug stuff in

do bad client side mana calculation

7ead10f

still debug

only don't check head pos on first block

7f157ce

still debug

improve head height test

4784404

still debug

add close floor check

3bebe3e

still debug

add can teleport though fire

fb67c47

still debug

add checking for diagonals

65c25df

still in debug

add new is floor check for the close floor check

a2a67bb

still debug

update allowed blocks and improve diagonal collision

b2819b7

still debug

diagonals only work if its floor block

dd0481e

still debug

java docs

0c60f71

remove debug

cbb31ab

can teleport though pots

d20a1b7

Update SmoothAOTE.java

aaae4dc

olim88 force-pushed the smoothAOTE branch from 618697b to aaae4dc Compare September 14, 2024 19:10

LifeIsAParadox added reviews needed This PR needs reviews and removed merge conflicts This PR has merge conflicts that need solving. labels Sep 14, 2024

kevinthegreat1 reviewed Sep 15, 2024

View reviewed changes

Apply suggestions from code review

7fec399

kevinthegreat1 previously approved these changes Sep 15, 2024

View reviewed changes

LifeIsAParadox added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels Sep 15, 2024

kevinthegreat1 reviewed Sep 15, 2024

View reviewed changes

AzureAaron requested changes Sep 15, 2024

View reviewed changes

LifeIsAParadox added changes requested This PR need changes and removed merge me please Pull requests that are ready to merge labels Sep 15, 2024

apply suggested changes

3c543c9

olim88 dismissed kevinthegreat1’s stale review via 3c543c9 September 22, 2024 16:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Smooth AOTE #963

Smooth AOTE #963

olim88 commented Aug 28, 2024

x-yingcan-x commented Aug 28, 2024 •

edited

Loading

viciscat left a comment

viciscat Aug 28, 2024

viciscat Aug 28, 2024

viciscat Aug 28, 2024

x-yingcan-x commented Aug 29, 2024

olim88 commented Aug 29, 2024

x-yingcan-x commented Aug 29, 2024

x-yingcan-x commented Aug 29, 2024

viciscat commented Aug 29, 2024

olim88 commented Aug 29, 2024

x-yingcan-x Aug 30, 2024

olim88 Aug 30, 2024

olim88 commented Sep 14, 2024

kevinthegreat1 Sep 15, 2024

AzureAaron Sep 15, 2024

AzureAaron Sep 15, 2024

AzureAaron Sep 15, 2024

AzureAaron Sep 15, 2024

AzureAaron Sep 15, 2024

AzureAaron Sep 15, 2024

	if (System.currentTimeMillis() - lastTeleportTime > 1000) {
	if (System.currentTimeMillis() - lastTeleportTime > Math.min(2 * lastPing, MAX_TELEPORT_TIME)) {

Smooth AOTE #963

Are you sure you want to change the base?

Smooth AOTE #963

Conversation

olim88 commented Aug 28, 2024

tests

small bugs

x-yingcan-x commented Aug 28, 2024 • edited Loading

viciscat left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

x-yingcan-x commented Aug 29, 2024

olim88 commented Aug 29, 2024

x-yingcan-x commented Aug 29, 2024

x-yingcan-x commented Aug 29, 2024

viciscat commented Aug 29, 2024

olim88 commented Aug 29, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

olim88 commented Sep 14, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

x-yingcan-x commented Aug 28, 2024 •

edited

Loading