Merge pull request 'Generalize some multiversioned code' (#225) from simplifyMultiversion into master

Reviewed-on: #225
Reviewed-by: YoyoNow <jwsteam@nidido.de>

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_14/src/de/steamwar/core/FlatteningWrapper14.java

@@ -22,6 +22,8 @@ package de.steamwar.core;
 import com.comphenix.tinyprotocol.Reflection;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 
@@ -322,4 +324,25 @@ public class FlatteningWrapper14 implements FlatteningWrapper.IFlatteningWrapper
     public Object formatDisplayName(String displayName) {
         return displayName != null ? Optional.of(ChatWrapper.impl.stringToChatComponent(displayName)) : Optional.empty();
     }
+
+    private static final Reflection.FieldAccessor<?> spawnType = Reflection.getField(ProtocolWrapper.spawnPacket, Reflection.getClass("{nms.world.entity}.EntityTypes"), 0);
+    private static final Reflection.FieldAccessor<?> spawnLivingType = Core.getVersion() > 19 ? spawnType : Reflection.getField(ProtocolWrapper.spawnLivingPacket, int.class, 1);
+    private static final Reflection.MethodInvoker getEntityTypes = Reflection.getMethod("{obc}.util.CraftMagicNumbers", "getEntityTypes", EntityType.class);
+    private static final Map<EntityType, Object> types = new HashMap<>();
+    static {
+        types.put(EntityType.ARMOR_STAND, 1);
+    }
+    @Override
+    public void setSpawnPacketType(Object packet, EntityType type) {
+        if(type.isAlive()) {
+            spawnLivingType.set(packet, Core.getVersion() > 18 ? getEntityTypes.invoke(null, type) : types.get(type));
+        } else {
+            spawnType.set(packet, getEntityTypes.invoke(null, type));
+        }
+    }
+
+    @Override
+    public int getViewDistance(Player player) {
+        return player.getClientViewDistance();
+    }
 }

SpigotCore_14/src/de/steamwar/techhider/BlockIds14.java

@@ -19,34 +19,55 @@
 
 package de.steamwar.techhider;
 
-import net.minecraft.server.v1_14_R1.*;
+import com.comphenix.tinyprotocol.Reflection;
+import com.google.common.collect.ImmutableList;
 import org.bukkit.Material;
 
 import java.util.HashSet;
 import java.util.Set;
 
 public class BlockIds14 implements BlockIds {
+
+    private static final Class<?> blockStateList = Reflection.getClass("{nms.world.level.block.state}.BlockStateList");
+    private static final Class<?> fluidTypeFlowing = Reflection.getClass("{nms.world.level.material}.FluidTypeFlowing");
+    private static final Class<?> fluid = Reflection.getClass("{nms.world.level.material}.Fluid");
+
+    private static final Reflection.MethodInvoker getBlockData = Reflection.getTypedMethod(TechHider.block, null, TechHider.iBlockData);
     @Override
     public int materialToId(Material material) {
-        return Block.getCombinedId(IRegistry.BLOCK.get(new MinecraftKey(material.name().toLowerCase())).getBlockData());
+        return getCombinedId(getBlockData.invoke(getBlock(material)));
     }
 
+    private static final Reflection.MethodInvoker getStates = Reflection.getTypedMethod(TechHider.block, null, blockStateList);
+    private static final Reflection.MethodInvoker getStateList = Reflection.getTypedMethod(blockStateList, null, ImmutableList.class);
+    private static final Object water = Reflection.getTypedMethod(fluidTypeFlowing, null, fluid).invoke(Reflection.getField(Reflection.getClass("{nms.world.level.material}.FluidTypes"), fluidTypeFlowing, 1).get(null));
+    private static final Iterable<?> registryBlockId = (Iterable<?>) Reflection.getField(TechHider.block, Reflection.getClass("{nms.core}.RegistryBlockID"), 0).get(null);
+    private static final Reflection.MethodInvoker getFluid = Reflection.getTypedMethod(TechHider.iBlockData, null, fluid);
     @Override
     public Set<Integer> materialToAllIds(Material material) {
         Set<Integer> ids = new HashSet<>();
-        for(IBlockData data : IRegistry.BLOCK.get(new MinecraftKey(material.name().toLowerCase())).getStates().a()) {
+        for(Object data : (ImmutableList<?>) getStateList.invoke(getStates.invoke(getBlock(material)))) {
-            ids.add(Block.getCombinedId(data));
+            ids.add(getCombinedId(data));
         }
 
-        if(material == Material.WATER){
+        if(material == Material.WATER) {
-            Fluid water = FluidTypes.WATER.a(false);
+            for(Object data : registryBlockId) {
-            for(IBlockData data : Block.REGISTRY_ID){
+                if(getFluid.invoke(data) == water) {
-                if(data.p() == water){
+                    ids.add(getCombinedId(data));
-                    ids.add(Block.getCombinedId(data));
                 }
             }
         }
 
         return ids;
     }
+
+    private static final Reflection.MethodInvoker getBlock = Reflection.getTypedMethod(TechHider.craftMagicNumbers, "getBlock", TechHider.block, Material.class);
+    private Object getBlock(Material material) {
+        return getBlock.invoke(null, material);
+    }
+
+    private static final Reflection.MethodInvoker getCombinedId = Reflection.getTypedMethod(TechHider.block, null, int.class, TechHider.iBlockData);
+    private int getCombinedId(Object blockData) {
+        return (int) getCombinedId.invoke(null, blockData);
+    }
 }

SpigotCore_14/src/de/steamwar/techhider/ProtocolWrapper14.java

@@ -40,7 +40,7 @@ public class ProtocolWrapper14 extends ProtocolWrapper8 {
             if(bypass.bypass(p, ProtocolUtils.posToChunk(TechHider.blockPositionX.get(pos)), ProtocolUtils.posToChunk(TechHider.blockPositionZ.get(pos))))
                 return packet;
 
-            if(ProtocolWrapper.impl.iBlockDataHidden(obfuscate, blockBreakBlockData.get(packet))){
+            if(TechHider.iBlockDataHidden(obfuscate, blockBreakBlockData.get(packet))){
                 packet = blockBreakCloner.apply(packet);
                 blockBreakBlockData.set(packet, obfuscationTarget);
             }

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_15/src/de/steamwar/techhider/BlockIds15.java

@@ -1,52 +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.server.v1_15_R1.*;
-import org.bukkit.Material;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class BlockIds15 implements BlockIds {
-    @Override
-    public int materialToId(Material material) {
-        return Block.getCombinedId(IRegistry.BLOCK.get(new MinecraftKey(material.name().toLowerCase())).getBlockData());
-    }
-
-    @Override
-    public Set<Integer> materialToAllIds(Material material) {
-        Set<Integer> ids = new HashSet<>();
-        for(IBlockData data : IRegistry.BLOCK.get(new MinecraftKey(material.name().toLowerCase())).getStates().a()) {
-            ids.add(Block.getCombinedId(data));
-        }
-
-        if(material == Material.WATER){
-            Fluid water = FluidTypes.WATER.a(false);
-            for(IBlockData data : Block.REGISTRY_ID){
-                if(data.getFluid() == water){
-                    ids.add(Block.getCombinedId(data));
-                }
-            }
-        }
-
-        return ids;
-    }
-}

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

@@ -19,24 +19,19 @@
 
 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.craftbukkit.v1_18_R2.CraftChunk;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 public class CraftbukkitWrapper18 implements CraftbukkitWrapper.ICraftbukkitWrapper {
 
-    @Override
+    private static final Reflection.MethodInvoker getHandle = Reflection.getMethod("{obc}.CraftChunk", "getHandle");
-    public void sendChunk(Player p, int chunkX, int chunkZ) {
-        Chunk chunk = ((CraftChunk)p.getWorld().getChunkAt(chunkX, chunkZ)).getHandle();
-        ((CraftPlayer)p).getHandle().b.a(new ClientboundLevelChunkWithLightPacket(chunk, chunk.q.l_(), null, null, false));
-    }
 
     @Override
-    @SuppressWarnings("deprecation")
+    public void sendChunk(Player p, int chunkX, int chunkZ) {
-    public double[] getSpigotTPS() {
+        Chunk chunk = (Chunk) getHandle.invoke(p.getWorld().getChunkAt(chunkX, chunkZ));
-        return MinecraftServer.getServer().recentTps;
+        TinyProtocol.instance.sendPacket(p, new ClientboundLevelChunkWithLightPacket(chunk, chunk.q.l_(), null, null, false));
     }
 }

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

@@ -22,8 +22,6 @@ package de.steamwar.core;
 import com.comphenix.tinyprotocol.Reflection;
 import com.mojang.authlib.GameProfile;
 import com.mojang.datafixers.util.Pair;
-import net.minecraft.world.entity.EntityTypes;
-import org.bukkit.entity.EntityType;
 
 import java.util.Collections;
 import java.util.List;
@@ -36,34 +34,6 @@ public class ProtocolWrapper18 implements ProtocolWrapper {
         equipmentStack.set(packet, Collections.singletonList(new Pair<>(slot, stack)));
     }
 
-    private static final Reflection.FieldAccessor<?> spawnType = Reflection.getField(ProtocolWrapper.spawnPacket, EntityTypes.class, 0);
-    private static final Reflection.FieldAccessor<Integer> spawnLivingType = Reflection.getField(ProtocolWrapper.spawnLivingPacket, int.class, 1);
-    @Override
-    public void setSpawnPacketType(Object packet, EntityType type) {
-        switch(type) {
-            case PRIMED_TNT:
-                spawnType.set(packet, EntityTypes.as);
-                break;
-            case ARROW:
-                spawnType.set(packet, EntityTypes.d);
-                break;
-            case FIREBALL:
-                spawnType.set(packet, EntityTypes.S);
-                break;
-            case ITEM_FRAME:
-                spawnType.set(packet, EntityTypes.R);
-                break;
-            case FALLING_BLOCK:
-                spawnType.set(packet, EntityTypes.C);
-                break;
-            case ARMOR_STAND:
-                spawnLivingType.set(packet, 1);
-                break;
-            default:
-                throw new IllegalArgumentException(type.name() + " is not implemented");
-        }
-    }
-
     private static final Reflection.ConstructorInvoker playerInfoDataConstructor = Reflection.getConstructor(playerInfoDataClass, GameProfile.class, int.class, enumGamemode, iChatBaseComponent);
     @Override
     public Object playerInfoDataConstructor(Object packet, GameProfile profile, Object mode) {

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

@@ -1,57 +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 net.minecraft.resources.MinecraftKey;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.IBlockData;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.level.material.FluidTypes;
-import org.bukkit.Material;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class BlockIds18 implements BlockIds {
-    @Override
-    public int materialToId(Material material) {
-        return Block.i(IRegistry.U.a(new MinecraftKey(material.name().toLowerCase())).n());
-    }
-
-    @Override
-    public Set<Integer> materialToAllIds(Material material) {
-        Set<Integer> ids = new HashSet<>();
-        for(IBlockData data : IRegistry.U.a(new MinecraftKey(material.name().toLowerCase())).m().a()){
-            ids.add(Block.i(data));
-        }
-
-        if(material == Material.WATER){
-            Fluid water = FluidTypes.c.h();
-            for(IBlockData data : Block.o) {
-                if(data.o() == water) {
-                    ids.add(Block.i(data));
-                }
-            }
-        }
-
-        return ids;
-    }
-}

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 = Reflection.getField(IRegistry.class, IRegistry.class, 0, TileEntityTypes.class).get(null);
+    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_18/src/de/steamwar/techhider/ProtocolWrapper18.java

@@ -20,9 +20,9 @@
 package de.steamwar.techhider;
 
 import com.comphenix.tinyprotocol.Reflection;
-import net.minecraft.core.IRegistry;
 import net.minecraft.core.SectionPosition;
 import net.minecraft.network.protocol.game.PacketPlayOutBlockBreak;
+import net.minecraft.world.level.block.entity.TileEntitySign;
 import net.minecraft.world.level.block.entity.TileEntityTypes;
 import net.minecraft.world.level.block.state.IBlockData;
 import org.bukkit.Material;
@@ -45,15 +45,16 @@ public class ProtocolWrapper18 implements ProtocolWrapper {
                 return packet;
 
             packet = TechHider.multiBlockChangeCloner.apply(packet);
-            multiBlockChangeBlocks.set(packet, iBlockDataArrayCloner.apply(multiBlockChangeBlocks.get(packet), block -> ProtocolWrapper.impl.iBlockDataHidden(obfuscate, block) ? obfuscationTarget : block));
+            multiBlockChangeBlocks.set(packet, iBlockDataArrayCloner.apply(multiBlockChangeBlocks.get(packet), block -> TechHider.iBlockDataHidden(obfuscate, block) ? obfuscationTarget : block));
             return packet;
         };
     }
 
     private static final Reflection.FieldAccessor<TileEntityTypes> tileEntityType = Reflection.getField(TechHider.tileEntityDataPacket, TileEntityTypes.class, 0);
+    private static final TileEntityTypes<?> signType = Reflection.getField(TileEntityTypes.class, TileEntityTypes.class, 0, TileEntitySign.class).get(null);
     @Override
     public boolean unfilteredTileEntityDataAction(Object packet) {
-        return tileEntityType.get(packet) != TileEntityTypes.h;
+        return tileEntityType.get(packet) != signType;
     }
 
     @Override
@@ -63,15 +64,10 @@ public class ProtocolWrapper18 implements ProtocolWrapper {
             if(bypass.bypass(p, ProtocolUtils.posToChunk(TechHider.blockPositionX.get(breakPacket.b())), ProtocolUtils.posToChunk(TechHider.blockPositionZ.get(breakPacket.b()))))
                 return packet;
 
-            if(!ProtocolWrapper.impl.iBlockDataHidden(obfuscate, breakPacket.c()))
+            if(!TechHider.iBlockDataHidden(obfuscate, breakPacket.c()))
                 return packet;
 
             return new PacketPlayOutBlockBreak(breakPacket.b(), (IBlockData) obfuscationTarget, breakPacket.d(), breakPacket.a());
         };
     }
-
-    @Override
-    public boolean iBlockDataHidden(Set<Material> obfuscate, Object iBlockData) {
-        return obfuscate.contains(Material.getMaterial(IRegistry.U.b(((IBlockData) iBlockData).b()).a().toUpperCase()));
-    }
 }

SpigotCore_19/src/de/steamwar/core/CraftbukkitWrapper19.java

@@ -1,42 +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.core;
-
-import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.chunk.Chunk;
-import org.bukkit.craftbukkit.v1_19_R1.CraftChunk;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class CraftbukkitWrapper19 implements CraftbukkitWrapper.ICraftbukkitWrapper {
-
-    @Override
-    public void sendChunk(Player p, int chunkX, int chunkZ) {
-        Chunk chunk = ((CraftChunk)p.getWorld().getChunkAt(chunkX, chunkZ)).getHandle();
-        ((CraftPlayer)p).getHandle().b.a(new ClientboundLevelChunkWithLightPacket(chunk, chunk.q.l_(), null, null, false));
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public double[] getSpigotTPS() {
-        return MinecraftServer.getServer().recentTps;
-    }
-}

SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java

@@ -22,8 +22,6 @@ package de.steamwar.core;
 import com.comphenix.tinyprotocol.Reflection;
 import com.mojang.authlib.GameProfile;
 import com.mojang.datafixers.util.Pair;
-import net.minecraft.world.entity.EntityTypes;
-import org.bukkit.entity.EntityType;
 
 import java.util.Collections;
 import java.util.List;
@@ -36,33 +34,6 @@ public class ProtocolWrapper19 implements ProtocolWrapper {
         equipmentStack.set(packet, Collections.singletonList(new Pair<>(slot, stack)));
     }
 
-    private static final Reflection.FieldAccessor<?> spawnType = Reflection.getField(ProtocolWrapper.spawnPacket, EntityTypes.class, 0);
-    @Override
-    public void setSpawnPacketType(Object packet, EntityType type) {
-        switch(type) {
-            case PRIMED_TNT:
-                spawnType.set(packet, EntityTypes.av);
-                break;
-            case ARROW:
-                spawnType.set(packet, EntityTypes.e);
-                break;
-            case FIREBALL:
-                spawnType.set(packet, EntityTypes.V);
-                break;
-            case ITEM_FRAME:
-                spawnType.set(packet, EntityTypes.U);
-                break;
-            case ARMOR_STAND:
-                spawnType.set(packet, EntityTypes.d);
-                break;
-            case FALLING_BLOCK:
-                spawnType.set(packet, EntityTypes.E);
-                break;
-            default:
-                throw new IllegalArgumentException(type.name() + " is not implemented");
-        }
-    }
-
     private static final Reflection.ConstructorInvoker playerInfoDataConstructor = Reflection.getConstructor(playerInfoDataClass, GameProfile.class, int.class, enumGamemode, iChatBaseComponent, Reflection.getClass("net.minecraft.world.entity.player.ProfilePublicKey$a"));
     @Override
     public Object playerInfoDataConstructor(Object packet, GameProfile profile, Object mode) {

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

@@ -1,57 +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 net.minecraft.resources.MinecraftKey;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.IBlockData;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.level.material.FluidTypes;
-import org.bukkit.Material;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class BlockIds19 implements BlockIds {
-    @Override
-    public int materialToId(Material material) {
-        return Block.i(IRegistry.V.a(new MinecraftKey(material.name().toLowerCase())).m());
-    }
-
-    @Override
-    public Set<Integer> materialToAllIds(Material material) {
-        Set<Integer> ids = new HashSet<>();
-        for(IBlockData data : IRegistry.V.a(new MinecraftKey(material.name().toLowerCase())).k().a()){
-            ids.add(Block.i(data));
-        }
-
-        if(material == Material.WATER){
-            Fluid water = FluidTypes.c.h();
-            for(IBlockData data : Block.o) {
-                if(data.p() == water) {
-                    ids.add(Block.i(data));
-                }
-            }
-        }
-
-        return ids;
-    }
-}

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_19/src/de/steamwar/techhider/ProtocolWrapper19.java

@@ -19,49 +19,16 @@
 
 package de.steamwar.techhider;
 
-import com.comphenix.tinyprotocol.Reflection;
-import net.minecraft.core.IRegistry;
-import net.minecraft.core.SectionPosition;
-import net.minecraft.world.level.block.entity.TileEntityTypes;
-import net.minecraft.world.level.block.state.IBlockData;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
 import java.util.Set;
 import java.util.function.BiFunction;
-import java.util.function.UnaryOperator;
 
-public class ProtocolWrapper19 implements ProtocolWrapper {
+public class ProtocolWrapper19 extends ProtocolWrapper18 {
-
-    private static final Reflection.FieldAccessor<SectionPosition> multiBlockChangeChunk = Reflection.getField(TechHider.multiBlockChangePacket, SectionPosition.class, 0);
-    private static final Reflection.FieldAccessor<IBlockData[]> multiBlockChangeBlocks = Reflection.getField(TechHider.multiBlockChangePacket, IBlockData[].class, 0);
-    private static final BiFunction<Object, UnaryOperator<Object>, Object> iBlockDataArrayCloner = ProtocolUtils.arrayCloneGenerator(TechHider.iBlockData);
-    @Override
-    public BiFunction<Player, Object, Object> multiBlockChangeGenerator(Object obfuscationTarget, Set<Material> obfuscate, TechHider.BypassEvaluator bypass) {
-        return (p, packet) -> {
-            Object chunkCoords = multiBlockChangeChunk.get(packet);
-            if(bypass.bypass(p, TechHider.blockPositionX.get(chunkCoords), TechHider.blockPositionZ.get(chunkCoords)))
-                return packet;
-
-            packet = TechHider.multiBlockChangeCloner.apply(packet);
-            multiBlockChangeBlocks.set(packet, iBlockDataArrayCloner.apply(multiBlockChangeBlocks.get(packet), block -> ProtocolWrapper.impl.iBlockDataHidden(obfuscate, block) ? obfuscationTarget : block));
-            return packet;
-        };
-    }
-
-    private static final Reflection.FieldAccessor<TileEntityTypes> tileEntityType = Reflection.getField(TechHider.tileEntityDataPacket, TileEntityTypes.class, 0);
-    @Override
-    public boolean unfilteredTileEntityDataAction(Object packet) {
-        return tileEntityType.get(packet) != TileEntityTypes.h;
-    }
 
     @Override
     public BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, Object obfuscationTarget, Set<Material> obfuscate, TechHider.BypassEvaluator bypass) {
         return null;
     }
-
-    @Override
-    public boolean iBlockDataHidden(Set<Material> obfuscate, Object iBlockData) {
-        return obfuscate.contains(Material.getMaterial(IRegistry.V.b(((IBlockData) iBlockData).b()).a().toUpperCase()));
-    }
 }

SpigotCore_8/src/de/steamwar/core/CraftbukkitWrapper8.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.core;
 
-import net.minecraft.server.v1_8_R3.MinecraftServer;
 import net.minecraft.server.v1_8_R3.PacketPlayOutMapChunk;
 import org.bukkit.craftbukkit.v1_8_R3.CraftChunk;
 import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
@@ -31,9 +30,4 @@ public class CraftbukkitWrapper8 implements CraftbukkitWrapper.ICraftbukkitWrapp
     public void sendChunk(Player p, int chunkX, int chunkZ) {
         ((CraftPlayer)p).getHandle().playerConnection.sendPacket(new PacketPlayOutMapChunk(((CraftChunk)p.getWorld().getChunkAt(chunkX, chunkZ)).getHandle(), true, 65535));
     }
-
-    @Override
-    public double[] getSpigotTPS() {
-        return MinecraftServer.getServer().recentTps;
-    }
 }

SpigotCore_8/src/de/steamwar/core/FlatteningWrapper8.java

@@ -21,9 +21,14 @@ package de.steamwar.core;
 
 import com.comphenix.tinyprotocol.Reflection;
 import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class FlatteningWrapper8 implements FlatteningWrapper.IFlatteningWrapper {
 
     private static final Reflection.FieldAccessor<String> scoreboardName = Reflection.getField(FlatteningWrapper.scoreboardObjective, String.class, 1);
@@ -84,4 +89,26 @@ public class FlatteningWrapper8 implements FlatteningWrapper.IFlatteningWrapper
     public Object formatDisplayName(String displayName) {
         return displayName != null ? displayName : "";
     }
+
+
+    private static final Reflection.FieldAccessor<?> spawnType = Reflection.getField(ProtocolWrapper.spawnPacket, int.class, Core.getVersion() > 8 ? 6 : 9);
+    private static final Reflection.FieldAccessor<Integer> spawnLivingType = Reflection.getField(ProtocolWrapper.spawnLivingPacket, int.class, 1);
+    private static final Map<EntityType, Object> types = new HashMap<>();
+    static {
+        types.put(EntityType.PRIMED_TNT, 50);
+        types.put(EntityType.ARMOR_STAND, 30);
+        types.put(EntityType.ARROW, 60);
+        types.put(EntityType.FIREBALL, 63);
+        types.put(EntityType.ITEM_FRAME, 18);
+        types.put(EntityType.FALLING_BLOCK, 21);
+    }
+    @Override
+    public void setSpawnPacketType(Object packet, EntityType type) {
+        (type.isAlive() ? spawnLivingType : spawnType).set(packet, types.get(type));
+    }
+
+    @Override
+    public int getViewDistance(Player player) {
+        return 10;
+    }
 }

SpigotCore_8/src/de/steamwar/core/ProtocolWrapper8.java

@@ -21,10 +21,6 @@ package de.steamwar.core;
 
 import com.comphenix.tinyprotocol.Reflection;
 import com.mojang.authlib.GameProfile;
-import org.bukkit.entity.EntityType;
-
-import java.util.HashMap;
-import java.util.Map;
 
 public class ProtocolWrapper8 implements ProtocolWrapper {
 
@@ -45,35 +41,6 @@ public class ProtocolWrapper8 implements ProtocolWrapper {
         equipmentStack.set(packet, stack);
     }
 
-    private static final Reflection.FieldAccessor<?> spawnType;
-    private static final Reflection.FieldAccessor<Integer> spawnLivingType = Reflection.getField(ProtocolWrapper.spawnLivingPacket, int.class, 1);
-    private static final Map<EntityType, Object> types = new HashMap<>();
-
-    static {
-        if(Core.getVersion() < 14) {
-            spawnType = Reflection.getField(ProtocolWrapper.spawnPacket, int.class, Core.getVersion() > 8 ? 6 : 9);
-            types.put(EntityType.PRIMED_TNT, 50);
-            types.put(EntityType.ARMOR_STAND, 30);
-            types.put(EntityType.ARROW, 60);
-            types.put(EntityType.FIREBALL, 63);
-            types.put(EntityType.ITEM_FRAME, 18);
-            types.put(EntityType.FALLING_BLOCK, 21);
-        } else {
-            Class<?> entityTypes = Reflection.getClass("{nms.world.entity}.EntityTypes");
-            spawnType = Reflection.getField(ProtocolWrapper.spawnPacket, entityTypes, 0);
-            types.put(EntityType.ARMOR_STAND, 1);
-            for(EntityType type : new EntityType[]{EntityType.PRIMED_TNT, EntityType.ARROW, EntityType.FIREBALL, EntityType.ITEM_FRAME, EntityType.FALLING_BLOCK})
-                types.put(type, Reflection.getField(entityTypes, type != EntityType.PRIMED_TNT ? type.name() : "TNT", entityTypes).get(null));
-        }
-    }
-    @Override
-    public void setSpawnPacketType(Object packet, EntityType type) {
-        if(type.isAlive())
-            spawnLivingType.set(packet, types.get(type));
-        else
-            spawnType.set(packet, types.get(type));
-    }
-
     private static final Reflection.ConstructorInvoker playerInfoDataConstructor = Reflection.getConstructor(playerInfoDataClass, playerInfoPacket, GameProfile.class, int.class, enumGamemode, iChatBaseComponent);
     @Override
     public Object playerInfoDataConstructor(Object packet, GameProfile profile, Object mode) {

SpigotCore_8/src/de/steamwar/techhider/ProtocolWrapper8.java

@@ -48,7 +48,7 @@ public class ProtocolWrapper8 implements ProtocolWrapper {
 
             Object modpacket = TechHider.multiBlockChangeCloner.apply(packet);
             multiBlockChangeInfos.set(modpacket, multiBlockChangeInfoArrayCloner.apply(multiBlockChangeInfos.get(modpacket), mbci -> {
-                if(ProtocolWrapper.impl.iBlockDataHidden(obfuscate, multiBlockChangeInfoBlock.get(mbci)))
+                if(TechHider.iBlockDataHidden(obfuscate, multiBlockChangeInfoBlock.get(mbci)))
                     return multiBlockChangeInfoConstructor.invoke(modpacket, multiBlockChangeInfoPos.get(mbci), obfuscationTarget);
                 return mbci;
             }));
@@ -66,11 +66,4 @@ public class ProtocolWrapper8 implements ProtocolWrapper {
     public BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, Object obfuscationTarget, Set<Material> obfuscate, TechHider.BypassEvaluator bypass) {
         return null;
     }
-
-    private static final Reflection.MethodInvoker getBlockByBlockData = Reflection.getTypedMethod(TechHider.iBlockData, null, TechHider.block);
-    private static final Reflection.MethodInvoker getMaterialByBlock = Reflection.getTypedMethod(TechHider.craftMagicNumbers, "getMaterial", Material.class, TechHider.block);
-    @Override
-    public boolean iBlockDataHidden(Set<Material> obfuscate, Object iBlockData) {
-        return obfuscate.contains((Material) getMaterialByBlock.invoke(null, getBlockByBlockData.invoke(iBlockData)));
-    }
 }

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/Core.java

@@ -46,28 +46,8 @@ public class Core extends JavaPlugin{
 
 	public static final Message MESSAGE = new Message("SpigotCore", Core.class.getClassLoader());
 
-	private static final int VERSION;
+	private static final int VERSION = Integer.parseInt(Bukkit.getServer().getClass().getPackage().getName().split("_", 3)[1]);
-	static{
+
-		String packageName = Bukkit.getServer().getClass().getPackage().getName();
-		if(packageName.contains("1_19"))
-			VERSION = 19;
-		else if(packageName.contains("1_18"))
-			VERSION = 18;
-		else if(packageName.contains("1_15"))
-			VERSION = 15;
-		else if(packageName.contains("1_14"))
-			VERSION = 14;
-		else if(packageName.contains("1_12"))
-			VERSION = 12;
-		else if(packageName.contains("1_10"))
-			VERSION = 10;
-		else if(packageName.contains("1_9"))
-			VERSION = 9;
-		else if(packageName.contains("1_8"))
-			VERSION = 8;
-		else
-			VERSION = 18;
-	}
 	public static int getVersion(){
 		return VERSION;
 	}

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/FlatteningWrapper.java

@@ -21,6 +21,8 @@ package de.steamwar.core;
 
 import com.comphenix.tinyprotocol.Reflection;
 import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 public class FlatteningWrapper {
@@ -42,6 +44,10 @@ public class FlatteningWrapper {
         Object getPose(EntityPose pose);
         void setNamedSpawnPacketDataWatcher(Object packet);
         Object formatDisplayName(String displayName);
+
+        void setSpawnPacketType(Object packet, EntityType type);
+
+        int getViewDistance(Player player);
     }
 
     public enum EntityPose {

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

@@ -21,7 +21,6 @@ package de.steamwar.core;
 
 import com.comphenix.tinyprotocol.Reflection;
 import com.mojang.authlib.GameProfile;
-import org.bukkit.entity.EntityType;
 
 public interface ProtocolWrapper {
 
@@ -41,8 +40,6 @@ public interface ProtocolWrapper {
 
     void setEquipmentPacketStack(Object packet, Object slot, Object stack);
 
-    void setSpawnPacketType(Object packet, EntityType type);
-
     Object playerInfoDataConstructor(Object packet, GameProfile profile, Object mode);
 
 }

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) {

SpigotCore_Main/src/de/steamwar/entity/REntity.java

@@ -410,7 +410,7 @@ public class REntity {
         return entity -> {
             Object packet = packetGenerator.apply(entity);
             uuid.set(packet, entity.uuid);
-            ProtocolWrapper.impl.setSpawnPacketType(packet, entity.entityType);
+            FlatteningWrapper.impl.setSpawnPacketType(packet, entity.entityType);
             return packet;
         };
     }

SpigotCore_Main/src/de/steamwar/entity/REntityServer.java

@@ -22,6 +22,7 @@ package de.steamwar.entity;
 import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.core.Core;
+import de.steamwar.core.FlatteningWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -247,7 +248,7 @@ public class REntityServer implements Listener {
     }
 
     private int viewRadius(Player player) {
-        return player.getClientViewDistance() / 2;
+        return FlatteningWrapper.impl.getViewDistance(player) / 2;
     }
 
     private long entityToId(REntity entity) {

SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java

@@ -36,6 +36,4 @@ public interface ProtocolWrapper {
     BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, Object obfuscationTarget, Set<Material> obfuscate, TechHider.BypassEvaluator bypass);
 
     BiFunction<Player, Object, Object> multiBlockChangeGenerator(Object obfuscationTarget, Set<Material> obfuscate, TechHider.BypassEvaluator bypass);
-
-    boolean iBlockDataHidden(Set<Material> obfuscate, Object iBlockData);
 }

SpigotCore_Main/src/de/steamwar/techhider/TechHider.java

@@ -46,6 +46,12 @@ public class TechHider {
     public static final Class<?> craftMagicNumbers = Reflection.getClass("{obc}.util.CraftMagicNumbers");
     private static final Reflection.MethodInvoker getBlockByMaterial = Reflection.getTypedMethod(craftMagicNumbers, "getBlock", block, Material.class);
 
+    private static final Reflection.MethodInvoker getBlockByBlockData = Reflection.getTypedMethod(iBlockData, null, block);
+    private static final Reflection.MethodInvoker getMaterialByBlock = Reflection.getTypedMethod(craftMagicNumbers, "getMaterial", Material.class, block);
+    public static boolean iBlockDataHidden(Set<Material> obfuscate, Object iBlockData) {
+        return obfuscate.contains((Material) getMaterialByBlock.invoke(null, getBlockByBlockData.invoke(iBlockData)));
+    }
+
     private final Map<Class<?>, BiFunction<Player, Object, Object>> techhiders = new HashMap<>();
     private final BypassEvaluator bypass;
     private final Object obfuscationTarget;
@@ -94,7 +100,7 @@ public class TechHider {
         if(bypass.bypass(p, ProtocolUtils.posToChunk(blockPositionX.get(pos)), ProtocolUtils.posToChunk(blockPositionZ.get(pos))))
             return packet;
 
-        if(ProtocolWrapper.impl.iBlockDataHidden(obfuscate, blockChangeBlockData.get(packet))) {
+        if(iBlockDataHidden(obfuscate, blockChangeBlockData.get(packet))) {
             packet = blockChangeCloner.apply(packet);
             blockChangeBlockData.set(packet, obfuscationTarget);
         }