Smooth AOTE

src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java

@@ -296,6 +296,53 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
                                 .build())
                         .build())
 
+                //Smooth AOTE
+                .group(OptionGroup.createBuilder()
+                        .name(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE"))
+                        .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.@Tooltip")))
+                        .collapsed(true)
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableWeirdTransmission"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableWeirdTransmission.@Tooltip")))
+                                .binding(defaults.uiAndVisuals.smoothAOTE.enableWeirdTransmission,
+                                        () -> config.uiAndVisuals.smoothAOTE.enableWeirdTransmission,
+                                        newValue -> config.uiAndVisuals.smoothAOTE.enableWeirdTransmission = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableInstantTransmission"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableInstantTransmission.@Tooltip")))
+                                .binding(defaults.uiAndVisuals.smoothAOTE.enableInstantTransmission,
+                                        () -> config.uiAndVisuals.smoothAOTE.enableInstantTransmission,
+                                        newValue -> config.uiAndVisuals.smoothAOTE.enableInstantTransmission = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableEtherTransmission"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableEtherTransmission.@Tooltip")))
+                                .binding(defaults.uiAndVisuals.smoothAOTE.enableEtherTransmission,
+                                        () -> config.uiAndVisuals.smoothAOTE.enableEtherTransmission,
+                                        newValue -> config.uiAndVisuals.smoothAOTE.enableEtherTransmission = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableSinrecallTransmission"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableSinrecallTransmission.@Tooltip")))
+                                .binding(defaults.uiAndVisuals.smoothAOTE.enableSinrecallTransmission,
+                                        () -> config.uiAndVisuals.smoothAOTE.enableSinrecallTransmission,
+                                        newValue -> config.uiAndVisuals.smoothAOTE.enableSinrecallTransmission = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableWitherImpact"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.smoothAOTE.enableWitherImpact.@Tooltip")))
+                                .binding(defaults.uiAndVisuals.smoothAOTE.enableWitherImpact,
+                                        () -> config.uiAndVisuals.smoothAOTE.enableWitherImpact,
+                                        newValue -> config.uiAndVisuals.smoothAOTE.enableWitherImpact = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .build())
+
                 //Search overlay
                 .group(OptionGroup.createBuilder()
                         .name(Text.translatable("skyblocker.config.uiAndVisuals.searchOverlay"))

src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java

@@ -55,6 +55,9 @@ public class UIAndVisualsConfig {
     @SerialEntry
     public TeleportOverlay teleportOverlay = new TeleportOverlay();
 
+    @SerialEntry
+    public SmoothAOTE smoothAOTE = new SmoothAOTE();
+
     @SerialEntry
     public SearchOverlay searchOverlay = new SearchOverlay();
 
@@ -223,6 +226,24 @@ public static class TeleportOverlay {
         public boolean enableWitherImpact = true;
     }
 
+    public static class SmoothAOTE {
+
+        @SerialEntry
+        public boolean enableWeirdTransmission = true;
+
+        @SerialEntry
+        public boolean enableInstantTransmission = true;
+
+        @SerialEntry
+        public boolean enableEtherTransmission = true;
+
+        @SerialEntry
+        public boolean enableSinrecallTransmission = true;
+
+        @SerialEntry
+        public boolean enableWitherImpact = true;
+    }
+
     public static class SearchOverlay {
         @SerialEntry
         public boolean enableBazaar = true;

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

@@ -0,0 +1,22 @@
+package de.hysky.skyblocker.mixins;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import de.hysky.skyblocker.skyblock.SmoothAOTE;
+import net.minecraft.client.render.Camera;
+import net.minecraft.util.math.Vec3d;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(Camera.class)
+public class CameraMixin {
+
+    @ModifyReturnValue(method = "getPos", at = @At("RETURN"))
+    private Vec3d skyblocker$onCameraUpdate(Vec3d original) {
+        Vec3d pos = SmoothAOTE.getInterpolatedPos();
+        if (pos != null) {
+            return pos;
+        }
+
+        return original;
+    }
+}

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

@@ -5,15 +5,17 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.config.configs.SlayersConfig;
+import de.hysky.skyblocker.config.configs.UIAndVisualsConfig;
 import de.hysky.skyblocker.skyblock.CompactDamage;
 import de.hysky.skyblocker.skyblock.FishingHelper;
+import de.hysky.skyblocker.skyblock.SmoothAOTE;
 import de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder;
 import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager;
 import de.hysky.skyblocker.skyblock.crimson.slayer.FirePillarAnnouncer;
 import de.hysky.skyblocker.skyblock.dungeon.DungeonScore;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
-import de.hysky.skyblocker.skyblock.dwarven.WishingCompassSolver;
 import de.hysky.skyblocker.skyblock.dwarven.CrystalsChestHighlighter;
+import de.hysky.skyblocker.skyblock.dwarven.WishingCompassSolver;
 import de.hysky.skyblocker.skyblock.end.EnderNodes;
 import de.hysky.skyblocker.skyblock.end.TheEnd;
 import de.hysky.skyblocker.skyblock.slayers.SlayerEntitiesGlow;
@@ -41,9 +43,9 @@ public abstract class ClientPlayNetworkHandlerMixin {
 	@Shadow
 	private ClientWorld world;
 
-    @Shadow
-    @Final
-    private static Logger LOGGER;
+	@Shadow
+	@Final
+	private static Logger LOGGER;
 
     @Inject(method = "method_64896", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V"))
     private void skyblocker$onItemDestroy(int entityId, CallbackInfo ci) {
@@ -52,87 +54,106 @@ public abstract class ClientPlayNetworkHandlerMixin {
         }
     }
 
-    @ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V", ordinal = 0))
-    private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity) {
-        DungeonManager.onItemPickup(itemEntity);
-        return itemEntity;
-    }
-
-    @WrapWithCondition(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V", remap = false))
-    private boolean skyblocker$cancelEntityPassengersWarning(Logger instance, String msg) {
-        return !Utils.isOnHypixel();
-    }
-
-    @WrapWithCondition(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$cancelPlayerListWarning(Logger instance, String format, Object arg1, Object arg2) {
-        return !Utils.isOnHypixel();
-    }
-
-    @Inject(method = "onPlaySound", at = @At("RETURN"))
-    private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
-        FishingHelper.onSound(packet);
-        CrystalsChestHighlighter.onSound(packet);
-    }
-
-    @WrapWithCondition(method = "warnOnUnknownPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$dropBadlionPacketWarnings(Logger instance, String message, Object identifier) {
-        return !(Utils.isOnHypixel() && ((Identifier) identifier).getNamespace().equals("badlion"));
-    }
-
-    @WrapWithCondition(method = {"onScoreboardScoreUpdate", "onScoreboardScoreReset"}, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$cancelUnknownScoreboardObjectiveWarnings(Logger instance, String message, Object objectiveName) {
-        return !Utils.isOnHypixel();
-    }
-
-    @WrapWithCondition(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
-        return !Utils.isOnHypixel();
-    }
-
-    @Inject(method = "onParticle", at = @At("RETURN"))
-    private void skyblocker$onParticle(ParticleS2CPacket packet, CallbackInfo ci) {
-        MythologicalRitual.onParticle(packet);
-        DojoManager.onParticle(packet);
-        CrystalsChestHighlighter.onParticle(packet);
-        EnderNodes.onParticle(packet);
-        WishingCompassSolver.onParticle(packet);
-    }
-
-    @ModifyExpressionValue(method = "onEntityStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/EntityStatusS2CPacket;getEntity(Lnet/minecraft/world/World;)Lnet/minecraft/entity/Entity;"))
-    private Entity skyblocker$onEntityDeath(Entity entity, @Local(argsOnly = true) EntityStatusS2CPacket packet) {
-        if (packet.getStatus() == EntityStatuses.PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES) {
-            DungeonScore.handleEntityDeath(entity);
-            TheEnd.onEntityDeath(entity);
-            SlayerEntitiesGlow.onEntityDeath(entity);
-        }
-        return entity;
-    }
-
-    @Inject(method = "onEntityTrackerUpdate", at = @At("TAIL"))
-    private void skyblocker$onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
-        if (!(entity instanceof ArmorStandEntity armorStandEntity)) return;
-
-        if (SkyblockerConfigManager.get().slayers.highlightMinis == SlayersConfig.HighlightSlayerEntities.GLOW && SlayerEntitiesGlow.isSlayerMiniMob(armorStandEntity)
-                || SkyblockerConfigManager.get().slayers.highlightBosses == SlayersConfig.HighlightSlayerEntities.GLOW && SlayerEntitiesGlow.isSlayer(armorStandEntity)) {
-            if (armorStandEntity.isDead()) {
-                SlayerEntitiesGlow.cleanupArmorstand(armorStandEntity);
-            } else {
-                SlayerEntitiesGlow.setSlayerMobGlow(armorStandEntity);
-            }
-        }
-
-        if (SkyblockerConfigManager.get().slayers.blazeSlayer.firePillarCountdown != SlayersConfig.BlazeSlayer.FirePillar.OFF) FirePillarAnnouncer.checkFirePillar(entity);
-
-        EggFinder.checkIfEgg(armorStandEntity);
-        try { //Prevent packet handling fails if something goes wrong so that entity trackers still update, just without compact damage numbers
-            CompactDamage.compactDamage(armorStandEntity);
-        } catch (Exception e) {
-            LOGGER.error("[Skyblocker Compact Damage] Failed to compact damage number", e);
-        }
-    }
-
-    @Inject(method = "onEntityEquipmentUpdate", at = @At(value = "TAIL"))
-    private void skyblocker$onEntityEquip(EntityEquipmentUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
-        EggFinder.checkIfEgg(entity);
-    }
+	@ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V", ordinal = 0))
+	private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity) {
+		DungeonManager.onItemPickup(itemEntity);
+		return itemEntity;
+	}
+
+	@WrapWithCondition(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V", remap = false))
+	private boolean skyblocker$cancelEntityPassengersWarning(Logger instance, String msg) {
+		return !Utils.isOnHypixel();
+	}
+
+	@WrapWithCondition(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
+	private boolean skyblocker$cancelPlayerListWarning(Logger instance, String format, Object arg1, Object arg2) {
+		return !Utils.isOnHypixel();
+	}
+
+	@Inject(method = "onPlaySound", at = @At("RETURN"))
+	private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
+		FishingHelper.onSound(packet);
+		CrystalsChestHighlighter.onSound(packet);
+	}
+
+	@WrapWithCondition(method = "warnOnUnknownPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
+	private boolean skyblocker$dropBadlionPacketWarnings(Logger instance, String message, Object identifier) {
+		return !(Utils.isOnHypixel() && ((Identifier) identifier).getNamespace().equals("badlion"));
+	}
+
+	@WrapWithCondition(method = {"onScoreboardScoreUpdate", "onScoreboardScoreReset"}, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
+	private boolean skyblocker$cancelUnknownScoreboardObjectiveWarnings(Logger instance, String message, Object objectiveName) {
+		return !Utils.isOnHypixel();
+	}
+
+	@WrapWithCondition(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
+	private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
+		return !Utils.isOnHypixel();
+	}
+
+	@Inject(method = "onParticle", at = @At("RETURN"))
+	private void skyblocker$onParticle(ParticleS2CPacket packet, CallbackInfo ci) {
+		MythologicalRitual.onParticle(packet);
+		DojoManager.onParticle(packet);
+		CrystalsChestHighlighter.onParticle(packet);
+		EnderNodes.onParticle(packet);
+		WishingCompassSolver.onParticle(packet);
+	}
+
+	@ModifyExpressionValue(method = "onEntityStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/EntityStatusS2CPacket;getEntity(Lnet/minecraft/world/World;)Lnet/minecraft/entity/Entity;"))
+	private Entity skyblocker$onEntityDeath(Entity entity, @Local(argsOnly = true) EntityStatusS2CPacket packet) {
+		if (packet.getStatus() == EntityStatuses.PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES) {
+			DungeonScore.handleEntityDeath(entity);
+			TheEnd.onEntityDeath(entity);
+			SlayerEntitiesGlow.onEntityDeath(entity);
+		}
+		return entity;
+	}
+
+	@Inject(method = "onEntityTrackerUpdate", at = @At("TAIL"))
+	private void skyblocker$onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
+		if (!(entity instanceof ArmorStandEntity armorStandEntity)) return;
+
+		if (SkyblockerConfigManager.get().slayers.highlightMinis == SlayersConfig.HighlightSlayerEntities.GLOW && SlayerEntitiesGlow.isSlayerMiniMob(armorStandEntity)
+				|| SkyblockerConfigManager.get().slayers.highlightBosses == SlayersConfig.HighlightSlayerEntities.GLOW && SlayerEntitiesGlow.isSlayer(armorStandEntity)) {
+			if (armorStandEntity.isDead()) {
+				SlayerEntitiesGlow.cleanupArmorstand(armorStandEntity);
+			} else {
+				SlayerEntitiesGlow.setSlayerMobGlow(armorStandEntity);
+			}
+		}
+
+		if (SkyblockerConfigManager.get().slayers.blazeSlayer.firePillarCountdown != SlayersConfig.BlazeSlayer.FirePillar.OFF)
+			FirePillarAnnouncer.checkFirePillar(entity);
+
+		EggFinder.checkIfEgg(armorStandEntity);
+		try { //Prevent packet handling fails if something goes wrong so that entity trackers still update, just without compact damage numbers
+			CompactDamage.compactDamage(armorStandEntity);
+		} catch (Exception e) {
+			LOGGER.error("[Skyblocker Compact Damage] Failed to compact damage number", e);
+		}
+	}
+
+	@Inject(method = "onEntityEquipmentUpdate", at = @At(value = "TAIL"))
+	private void skyblocker$onEntityEquip(EntityEquipmentUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
+		EggFinder.checkIfEgg(entity);
+	}
+
+	@Inject(method = "onPlayerPositionLook", at = @At("TAIL"))
+	private void onPlayerTeleported(PlayerPositionLookS2CPacket packet, CallbackInfo ci) {
+		//player has been teleported by the server tell the smooth AOTE this
+		SmoothAOTE.playerTeleported();
+	}
+
+	@ModifyExpressionValue(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/DebugHud;shouldShowPacketSizeAndPingCharts()Z"))
+	private boolean shouldShowPacketSizeAndPingCharts(boolean original) {
+		//make the f3+3 screen always send ping packets even when closed
+		//this is needed to make smooth AOTE work so check if its enabled
+		UIAndVisualsConfig.SmoothAOTE options = SkyblockerConfigManager.get().uiAndVisuals.smoothAOTE;
+		if (Utils.isOnSkyblock() && !SmoothAOTE.teleportDisabled && (options.enableWeirdTransmission || options.enableEtherTransmission || options.enableInstantTransmission || options.enableSinrecallTransmission || options.enableWitherImpact)) {
+			return true;
+		}
+		return original;
+
+	}
 }

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

@@ -1,5 +1,6 @@
 package de.hysky.skyblocker.mixins;
 
+import de.hysky.skyblocker.skyblock.SmoothAOTE;
 import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager;
 import de.hysky.skyblocker.utils.Utils;
 import net.minecraft.client.network.PingMeasurer;
@@ -15,6 +16,7 @@ public class PingMeasurerMixin {
         if (Utils.isInCrimson()) {
             DojoManager.onPingResult(ping);
         }
+        SmoothAOTE.updatePing(ping);
 
         return ping;
     }