Handle ClientboundTickingStatePacket correctly and fix Throwable Scales #4850

letsgoawaydev · 2024-07-12T14:13:39Z

Handles custom tick rates sent from the ClientboundTickingStatePacket correctly. This freezes all tickable entitys and changes the geyser session tick() function update speed correctly.

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

Konicai

thank you!

core/src/main/java/org/geysermc/geyser/entity/type/ThrowableItemEntity.java

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

Konicai · 2024-07-13T04:38:20Z

It would also be nice to implement ClientboundTickingStepPacket if you're able

letsgoawaydev · 2024-07-13T10:01:55Z

It would also be nice to implement ClientboundTickingStepPacket if you're able

Fixed in latest commit.

Konicai · 2024-07-14T05:54:15Z

Can review in 12hrs

core/src/main/java/org/geysermc/geyser/entity/type/ThrowableItemEntity.java

core/src/main/java/org/geysermc/geyser/entity/type/Tickable.java

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

Co-authored-by: rtm516 <rtm516@users.noreply.github.com>

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

core/src/main/resources/languages

letsgoawaydev · 2024-07-30T03:49:55Z

Some issues I've noticed, handling of block breaking speed when tick rate is less than 20 is not correct and player speed/gravity is not correct

letsgoawaydev · 2024-07-30T03:51:23Z

Also animations are way too quick on the bedrock side, for other players I think we could send that they have mining fatigue to the session so that their arm animation speeds are slower

Most stuff like this we probably cant fix, though

Camotoy · 2024-07-30T04:06:17Z

Yeah, I don't think we should aim to resolve every single thing, seeing as Bedrock will still be operating under a 20 ticks per second cycle. I assume most people will be using this as a debugging tool, or is that assessment incorrect?

letsgoawaydev · 2024-07-30T04:15:33Z

Yeah, I don't think we should aim to resolve every single thing, seeing as Bedrock will still be operating under a 20 ticks per second cycle. I assume most people will be using this as a debugging tool, or is that assessment incorrect?

Its mostly used for testing redstone, in my case I use it for testing plugins.
Also, I think that drawTick should be handled at 20 TPS because Bedrock still updates at 20 TPS, and the rendering system in Java updates every frame afaik. Using 20 tps would ensure that it doesnt update too much on fast tickrates while also similarly matching Java

letsgoawaydev · 2024-07-31T02:45:04Z

Yeah, I don't think we should aim to resolve every single thing, seeing as Bedrock will still be operating under a 20 ticks per second cycle. I assume most people will be using this as a debugging tool, or is that assessment incorrect?

Its mostly used for testing redstone, in my case I use it for testing plugins.

Also, I think that drawTick should be handled at 20 TPS because Bedrock still updates at 20 TPS, and the rendering system in Java updates every frame afaik. Using 20 tps would ensure that it doesnt update too much on fast tickrates while also similarly matching Java

nvm i dont think it updates the tick count every frame, should keep draw tick updating at the same speed as the game

Konicai

Also, the setInvisible method for throwable items used to be able to force the entity to be invisible. would be nice to restore that behaviour

core/src/main/java/org/geysermc/geyser/entity/type/ThrowableItemEntity.java

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

letsgoawaydev · 2024-08-09T06:32:23Z

I'm going to try complete this today, if i can't finish it today I will try tomorrow.

…/Geyser into tick-rate-handling

Konicai · 2024-08-10T22:35:38Z

core/src/main/java/org/geysermc/geyser/util/CooldownUtils.java

@@ -91,7 +92,8 @@ public static void sendCooldown(GeyserSession session) {
     */
    private static void computeCooldown(GeyserSession session, CooldownType sessionPreference, long lastHitTime) {
        if (session.isClosed()) return; // Don't run scheduled tasks if the client left
-        if (lastHitTime != session.getLastHitTime()) return; // Means another cooldown has started so there's no need to continue this one
+        if (lastHitTime != session.getLastHitTime())
+            return; // Means another cooldown has started so there's no need to continue this one


revert or add braces

Konicai · 2024-08-10T22:35:43Z

core/src/main/java/org/geysermc/geyser/util/CooldownUtils.java

@@ -58,7 +58,8 @@ public static void sendCooldown(GeyserSession session) {
        CooldownType sessionPreference = session.getPreferencesCache().getCooldownPreference();
        if (sessionPreference == CooldownType.DISABLED) return;

-        if (session.getAttackSpeed() == 0.0 || session.getAttackSpeed() > 20) return; // 0.0 usually happens on login and causes issues with visuals; anything above 20 means a plugin like OldCombatMechanics is being used
+        if (session.getAttackSpeed() == 0.0 || session.getAttackSpeed() > 20)
+            return; // 0.0 usually happens on login and causes issues with visuals; anything above 20 means a plugin like OldCombatMechanics is being used


revert or add braces

core/src/main/java/org/geysermc/geyser/entity/type/ThrowableItemEntity.java

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

letsgoawaydev · 2024-08-31T09:42:24Z

Okay, I've fixed title animations, attack indicator and some item cooldowns to be updated with tick rate. I'm not sure what other things require changes but it should be ready for testing if anyone can

core/src/main/java/org/geysermc/geyser/util/CooldownUtils.java

onebeastchris · 2024-08-31T09:45:58Z

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

@@ -652,6 +655,17 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {

    private MinecraftProtocol protocol;

+    @Getter


The class is annotated with a getter, this is likely unnecessary

onebeastchris · 2024-08-31T09:46:05Z

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

@@ -652,6 +655,17 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {

    private MinecraftProtocol protocol;

+    @Getter
+    private int nanosecondsPerTick = 50000000;
+    @Getter


same as above

Co-authored-by: chris <github@onechris.mozmail.com>

Proper tick rate handling

3d957e3

Camotoy reviewed Jul 12, 2024

View reviewed changes

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java Outdated Show resolved Hide resolved

letsgoawaydev added 2 commits July 13, 2024 11:22

Fix frozen variable getter

91a1a12

Merge branch 'master' into tick-rate-handling

83fab59

Konicai requested changes Jul 13, 2024

View reviewed changes

letsgoawaydev force-pushed the tick-rate-handling branch 2 times, most recently from 47e69a1 to 83fab59 Compare July 13, 2024 07:40

letsgoawaydev added 3 commits July 13, 2024 15:42

Fix formatting i think third attempt

8418691

Formatting fix attempt 5 fsdiofhsdioufhvuisdhviuo9ds

fc04909

Fix stuff, also fixed the sizing of throwables as they were to big

f83e2fb

Move update ticking state

4fd9cbe

letsgoawaydev requested review from Camotoy and Konicai July 13, 2024 10:06

letsgoawaydev changed the title ~~Handle ClientboundTickingStatePacket correctly~~ Handle ClientboundTickingStatePacket correctly and fix Throwable Scales Jul 13, 2024

Merge branch 'master' into tick-rate-handling

dc130eb

Konicai added the PR: Bugfix When a PR contains a bugfix label Jul 15, 2024

Merge branch 'master' into tick-rate-handling

d20b18a

Camotoy reviewed Jul 17, 2024

View reviewed changes

rtm516 reviewed Jul 17, 2024

View reviewed changes

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java Outdated Show resolved Hide resolved

Update core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

0eb9134

Co-authored-by: rtm516 <rtm516@users.noreply.github.com>

onebeastchris reviewed Jul 23, 2024

View reviewed changes

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java Outdated Show resolved Hide resolved

onebeastchris reviewed Jul 23, 2024

View reviewed changes

core/src/main/resources/languages Outdated Show resolved Hide resolved

letsgoawaydev and others added 5 commits July 24, 2024 07:05

Merge branch 'master' into tick-rate-handling

b2a5cd5

Fixes for spaces and documentation

b8b0517

Missed a space

02c0469

wait now ive fixed it

611b010

Fix languages

4f345c0

letsgoawaydev and others added 2 commits July 30, 2024 00:05

fix some tick rate stuffs

e348d3e

Fix build fail

7af831f

letsgoawaydev requested a review from Konicai July 30, 2024 03:48

Merge branch 'master' into tick-rate-handling

c5f1f83

Konicai reviewed Jul 31, 2024

View reviewed changes

letsgoawaydev added 2 commits August 6, 2024 12:56

Merge branch 'master' into tick-rate-handling

e78568d

Merge branch 'master' into tick-rate-handling

ad3990b

letsgoawaydev added 2 commits August 10, 2024 13:18

fix some stuff

99e7385

Merge branch 'tick-rate-handling' of https://github.com/letsgoawaydev…

089d96c

…/Geyser into tick-rate-handling

Konicai requested changes Aug 10, 2024

View reviewed changes

letsgoawaydev and others added 10 commits August 16, 2024 21:01

Merge remote-tracking branch 'upstream/master' into tick-rate-handling

bd27743

Merge remote-tracking branch 'upstream/master' into tick-rate-handling

27de994

merge

e5a2ae4

test

807881f

Update languages

3602fc2

Update mappings

21b87c8

Merge branch 'master' into tick-rate-handling

dd40bb1

delete broken stuff

079c4e6

Fix cooldown

90a0119

fix cooldowns

dcc3dce

letsgoawaydev requested a review from Konicai August 31, 2024 09:43

onebeastchris reviewed Aug 31, 2024

View reviewed changes

Update core/src/main/java/org/geysermc/geyser/util/CooldownUtils.java

4fc1d66

Co-authored-by: chris <github@onechris.mozmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handle ClientboundTickingStatePacket correctly and fix Throwable Scales #4850

Handle ClientboundTickingStatePacket correctly and fix Throwable Scales #4850

letsgoawaydev commented Jul 12, 2024

Konicai left a comment

Konicai commented Jul 13, 2024

letsgoawaydev commented Jul 13, 2024

Konicai commented Jul 14, 2024

letsgoawaydev commented Jul 30, 2024

letsgoawaydev commented Jul 30, 2024 •

edited

Loading

Camotoy commented Jul 30, 2024

letsgoawaydev commented Jul 30, 2024

letsgoawaydev commented Jul 31, 2024

Konicai left a comment

letsgoawaydev commented Aug 9, 2024

Konicai Aug 10, 2024

Konicai Aug 10, 2024

letsgoawaydev commented Aug 31, 2024

onebeastchris Aug 31, 2024

onebeastchris Aug 31, 2024

		@@ -652,6 +655,17 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {

		private MinecraftProtocol protocol;

		@Getter

Handle ClientboundTickingStatePacket correctly and fix Throwable Scales #4850

Are you sure you want to change the base?

Handle ClientboundTickingStatePacket correctly and fix Throwable Scales #4850

Conversation

letsgoawaydev commented Jul 12, 2024

Konicai left a comment

Choose a reason for hiding this comment

Konicai commented Jul 13, 2024

letsgoawaydev commented Jul 13, 2024

Konicai commented Jul 14, 2024

letsgoawaydev commented Jul 30, 2024

letsgoawaydev commented Jul 30, 2024 • edited Loading

Camotoy commented Jul 30, 2024

letsgoawaydev commented Jul 30, 2024

letsgoawaydev commented Jul 31, 2024

Konicai left a comment

Choose a reason for hiding this comment

letsgoawaydev commented Aug 9, 2024

Konicai Aug 10, 2024

Choose a reason for hiding this comment

Konicai Aug 10, 2024

Choose a reason for hiding this comment

letsgoawaydev commented Aug 31, 2024

onebeastchris Aug 31, 2024

Choose a reason for hiding this comment

onebeastchris Aug 31, 2024

Choose a reason for hiding this comment

letsgoawaydev commented Jul 30, 2024 •

edited

Loading