Reflection getTps, sendChunk, tileEntityVisible

SpigotCore_10/src/de/steamwar/core/CraftbukkitWrapper10.java

@@ -1,40 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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 <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.core;
-
-import net.minecraft.server.v1_10_R1.MinecraftServer;
-import net.minecraft.server.v1_10_R1.PacketPlayOutMapChunk;
-import org.bukkit.craftbukkit.v1_10_R1.CraftChunk;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class CraftbukkitWrapper10 implements CraftbukkitWrapper.ICraftbukkitWrapper {
-
-    @Override
-    public void sendChunk(Player p, int chunkX, int chunkZ) {
-        ((CraftPlayer)p).getHandle().playerConnection.sendPacket(new PacketPlayOutMapChunk(((CraftChunk)p.getWorld().getChunkAt(chunkX, chunkZ)).getHandle(), 65535));
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public double[] getSpigotTPS() {
-        return MinecraftServer.getServer().recentTps;
-    }
-}

SpigotCore_12/src/de/steamwar/core/CraftbukkitWrapper12.java

@@ -1,40 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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 <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.core;
-
-import net.minecraft.server.v1_12_R1.MinecraftServer;
-import net.minecraft.server.v1_12_R1.PacketPlayOutMapChunk;
-import org.bukkit.craftbukkit.v1_12_R1.CraftChunk;
-import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class CraftbukkitWrapper12 implements CraftbukkitWrapper.ICraftbukkitWrapper {
-
-    @Override
-    public void sendChunk(Player p, int chunkX, int chunkZ) {
-        ((CraftPlayer)p).getHandle().playerConnection.sendPacket(new PacketPlayOutMapChunk(((CraftChunk)p.getWorld().getChunkAt(chunkX, chunkZ)).getHandle(), 65535));
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public double[] getSpigotTPS() {
-        return MinecraftServer.getServer().recentTps;
-    }
-}

SpigotCore_14/src/de/steamwar/core/CraftbukkitWrapper14.java

@@ -1,40 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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 <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.core;
-
-import net.minecraft.server.v1_14_R1.MinecraftServer;
-import net.minecraft.server.v1_14_R1.PacketPlayOutMapChunk;
-import org.bukkit.craftbukkit.v1_14_R1.CraftChunk;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class CraftbukkitWrapper14 implements CraftbukkitWrapper.ICraftbukkitWrapper {
-
-    @Override
-    public void sendChunk(Player p, int chunkX, int chunkZ) {
-        ((CraftPlayer)p).getHandle().playerConnection.sendPacket(new PacketPlayOutMapChunk(((CraftChunk)p.getWorld().getChunkAt(chunkX, chunkZ)).getHandle(), 65535));
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public double[] getSpigotTPS() {
-        return MinecraftServer.getServer().recentTps;
-    }
-}

SpigotCore_15/src/de/steamwar/core/CraftbukkitWrapper15.java

@@ -1,40 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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 <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.core;
-
-import net.minecraft.server.v1_15_R1.MinecraftServer;
-import net.minecraft.server.v1_15_R1.PacketPlayOutMapChunk;
-import org.bukkit.craftbukkit.v1_15_R1.CraftChunk;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class CraftbukkitWrapper15 implements CraftbukkitWrapper.ICraftbukkitWrapper {
-
-    @Override
-    public void sendChunk(Player p, int chunkX, int chunkZ) {
-        ((CraftPlayer)p).getHandle().playerConnection.sendPacket(new PacketPlayOutMapChunk(((CraftChunk)p.getWorld().getChunkAt(chunkX, chunkZ)).getHandle(), 65535));
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public double[] getSpigotTPS() {
-        return MinecraftServer.getServer().recentTps;
-    }
-}

SpigotCore_18/src/de/steamwar/core/CraftbukkitWrapper18.java

@@ -22,7 +22,6 @@ package de.steamwar.core;
 import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.chunk.Chunk;
 import org.bukkit.entity.Player;
 
@@ -35,10 +34,4 @@ public class CraftbukkitWrapper18 implements CraftbukkitWrapper.ICraftbukkitWrap
         Chunk chunk = (Chunk) getHandle.invoke(p.getWorld().getChunkAt(chunkX, chunkZ));
         TinyProtocol.instance.sendPacket(p, new ClientboundLevelChunkWithLightPacket(chunk, chunk.q.l_(), null, null, false));
     }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public double[] getSpigotTPS() {
-        return MinecraftServer.getServer().recentTps;
-    }
 }

SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java

@@ -25,6 +25,7 @@ import io.netty.buffer.UnpooledByteBufAllocator;
 import net.minecraft.core.IRegistry;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
+import net.minecraft.resources.MinecraftKey;
 import net.minecraft.util.SimpleBitStorage;
 import net.minecraft.world.level.block.entity.TileEntityTypes;
 import org.bukkit.World;
@@ -53,8 +54,6 @@ public class ChunkHider18 implements ChunkHider {
 
     private static final Reflection.FieldAccessor<byte[]> dataField = Reflection.getField(ClientboundLevelChunkPacketData.class, byte[].class, 0);
     private static final Reflection.FieldAccessor<List> tileEntities = Reflection.getField(ClientboundLevelChunkPacketData.class, List.class, 0);
-    public static final Class<?> tileEntity = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData$a");
-    protected static final Reflection.FieldAccessor<TileEntityTypes> entityType = Reflection.getField(tileEntity, TileEntityTypes.class, 0);
 
     @Override
     public BiFunction<Player, Object, Object> chunkHiderGenerator(TechHider.BypassEvaluator bypass, int obfuscationTarget, Set<Integer> obfuscate, Set<String> hiddenBlockEntities) {
@@ -76,8 +75,13 @@ public class ChunkHider18 implements ChunkHider {
         };
     }
 
+    public static final Class<?> tileEntity = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData$a");
+    protected static final Reflection.FieldAccessor<TileEntityTypes> entityType = Reflection.getField(tileEntity, TileEntityTypes.class, 0);
+    private static final IRegistry<TileEntityTypes<?>> tileEntityTypes = (IRegistry<TileEntityTypes<?>>) Reflection.getField(IRegistry.class, IRegistry.class, 0, TileEntityTypes.class);
+    private static final Reflection.MethodInvoker getKey = Reflection.getTypedMethod(IRegistry.class, null, MinecraftKey.class, Object.class);
+    private static final Reflection.MethodInvoker getName = Reflection.getTypedMethod(MinecraftKey.class, null, String.class);
     protected boolean tileEntityVisible(Set<String> hiddenBlockEntities, Object tile) {
-        return !hiddenBlockEntities.contains(IRegistry.aa.b(entityType.get(tile)).a());
+        return !hiddenBlockEntities.contains((String) getName.invoke(getKey.invoke(tileEntityTypes, entityType.get(tile))));
     }
 
     private byte[] dataHider(int obfuscationTarget, Set<Integer> obfuscate, byte[] data, int sections) {

SpigotCore_19/src/de/steamwar/techhider/ChunkHider19.java

@@ -1,31 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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 <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.techhider;
-
-import net.minecraft.core.IRegistry;
-
-import java.util.Set;
-
-public class ChunkHider19 extends ChunkHider18 {
-    @Override
-    protected boolean tileEntityVisible(Set<String> hiddenBlockEntities, Object tile) {
-        return !hiddenBlockEntities.contains(IRegistry.ab.b(entityType.get(tile)).a());
-    }
-}

SpigotCore_9/src/de/steamwar/core/CraftbukkitWrapper9.java

@@ -19,22 +19,19 @@
 
 package de.steamwar.core;
 
-import net.minecraft.server.v1_9_R2.MinecraftServer;
+import com.comphenix.tinyprotocol.Reflection;
-import net.minecraft.server.v1_9_R2.PacketPlayOutMapChunk;
+import com.comphenix.tinyprotocol.TinyProtocol;
-import org.bukkit.craftbukkit.v1_9_R2.CraftChunk;
-import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 public class CraftbukkitWrapper9 implements CraftbukkitWrapper.ICraftbukkitWrapper {
 
+    private static final Class<?> chunk = Reflection.getClass("{nms.world.level.chunk}.Chunk");
+    private static final Class<?> packetPlayOutMapChunk = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutMapChunk");
+    private static final Reflection.ConstructorInvoker newPacketPlayOutMapChunk = Reflection.getConstructor(packetPlayOutMapChunk, chunk, int.class);
+    private static final Reflection.MethodInvoker getHandle = Reflection.getMethod("{obc}.CraftChunk", "getHandle");
+
     @Override
     public void sendChunk(Player p, int chunkX, int chunkZ) {
-        ((CraftPlayer)p).getHandle().playerConnection.sendPacket(new PacketPlayOutMapChunk(((CraftChunk)p.getWorld().getChunkAt(chunkX, chunkZ)).getHandle(), 65535));
+        TinyProtocol.instance.sendPacket(p, newPacketPlayOutMapChunk.invoke(getHandle.invoke(p.getWorld().getChunkAt(chunkX, chunkZ)), 65535));
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public double[] getSpigotTPS() {
-        return MinecraftServer.getServer().recentTps;
     }
 }

SpigotCore_Main/src/de/steamwar/core/CraftbukkitWrapper.java

@@ -28,6 +28,5 @@ public class CraftbukkitWrapper {
 
     public interface ICraftbukkitWrapper {
         void sendChunk(Player p, int chunkX, int chunkZ);
-        double[] getSpigotTPS();
     }
 }

SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.core;
 
+import com.comphenix.tinyprotocol.Reflection;
 import org.bukkit.Bukkit;
 
 public class TPSWatcher {
@@ -78,8 +79,11 @@ public class TPSWatcher {
         }
     }
 
+    private static final Class<?> minecraftServer = Reflection.getClass("{nms.server}.MinecraftServer");
+    private static final Reflection.MethodInvoker getServer = Reflection.getTypedMethod(minecraftServer, "getServer", minecraftServer);
+    private static final Reflection.FieldAccessor<double[]> recentTps = Reflection.getField(minecraftServer, "recentTps", double[].class);
     private static double[] getSpigotTPS() {
-        return CraftbukkitWrapper.impl.getSpigotTPS();
+        return recentTps.get(getServer.invoke(null));
     }
 
     private static double round(double d) {