diff --git a/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java b/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java index b4b0f8f..f4f399f 100644 --- a/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java +++ b/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java @@ -22,6 +22,7 @@ package de.steamwar.core; import com.comphenix.tinyprotocol.Reflection; import com.mojang.authlib.GameProfile; import com.mojang.datafixers.util.Pair; +import net.minecraft.SystemUtils; import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket; import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket; import net.minecraft.world.level.EnumGamemode; @@ -30,6 +31,7 @@ import org.bukkit.GameMode; import java.util.Collections; import java.util.EnumSet; import java.util.List; +import java.util.function.LongSupplier; public class ProtocolWrapper19 implements ProtocolWrapper { @@ -54,4 +56,9 @@ public class ProtocolWrapper19 implements ProtocolWrapper { updatePlayers.set(packet, Collections.singletonList(new ClientboundPlayerInfoUpdatePacket.b(profile.getId(), profile, false, 0, EnumGamemode.a(mode.getValue()), null, null))); return packet; } + + @Override + public void initTPSWarp(LongSupplier longSupplier) { + SystemUtils.a = () -> System.nanoTime() + longSupplier.getAsLong(); + } } diff --git a/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java b/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java index 6d140ca..e678749 100644 --- a/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java +++ b/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java @@ -23,6 +23,8 @@ import com.comphenix.tinyprotocol.Reflection; import com.mojang.authlib.GameProfile; import org.bukkit.GameMode; +import java.util.function.LongSupplier; + public interface ProtocolWrapper { Class itemStack = Reflection.getClass("{nms.world.item}.ItemStack"); @@ -42,6 +44,11 @@ public interface ProtocolWrapper { Object playerInfoPacketConstructor(PlayerInfoAction action, GameProfile profile, GameMode mode); + default void initTPSWarp(LongSupplier longSupplier) { + Class systemUtils = Reflection.getClass("{nms}.SystemUtils"); + Reflection.getField(systemUtils, LongSupplier.class, 0).set(systemUtils, (LongSupplier) () -> System.nanoTime() + longSupplier.getAsLong()); + } + enum PlayerInfoAction { ADD, GAMEMODE, diff --git a/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java b/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java new file mode 100644 index 0000000..3550a99 --- /dev/null +++ b/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java @@ -0,0 +1,56 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2023 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.core; + +import com.comphenix.tinyprotocol.Reflection; +import de.steamwar.core.Core; +import lombok.experimental.UtilityClass; +import org.bukkit.Bukkit; +import org.bukkit.scheduler.BukkitTask; + +import java.util.function.LongSupplier; + +@UtilityClass +public class TPSWarpUtils { + + private static long nanoOffset = 0; + private static long nanoDOffset = 0; + private static BukkitTask bukkitTask = null; + + static { + ProtocolWrapper.impl.initTPSWarp(() -> nanoOffset); + } + + public static void warp(double tps) { + double d = 50 - (50 / (tps / 20.0)); + nanoDOffset = Math.max(0, (long) (d * 1000000)); + if (nanoDOffset == 0) { + if (bukkitTask == null) return; + bukkitTask.cancel(); + bukkitTask = null; + } else if (bukkitTask == null) { + bukkitTask = Bukkit.getScheduler().runTaskTimer(Core.getInstance(), () -> nanoOffset += nanoDOffset, 1, 1); + } + } + + public static boolean isWarping() { + return nanoDOffset > 0; + } +}