IT0NA31/ForkWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Normalize block entity IDs and handle bundled packets

Browse Source 
- Normalize hidden block entity identifiers across versions
- Add block break and tile entity handling for newer protocol versions
- Preserve packet filtering through bundle packets and fix chunk section copying
This commit is contained in:
Chaoscaot
2026-05-11 23:40:36 +02:00
parent 1ea8dea381
commit 5305aaf669
11 changed files with 291 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class ChunkHider18 implements ChunkHider {
private static final Reflection.Method getKey = Reflection.getTypedMethod(IRegistry.class, null, MinecraftKey.class, Object.class);
private static final Reflection.Method getName = Reflection.getTypedMethod(MinecraftKey.class, null, String.class);
protected boolean tileEntityVisible(Set<String> hiddenBlockEntities, Object tile) {
return !hiddenBlockEntities.contains((String) getName.invoke(getKey.invoke(tileEntityTypes, entityType.get(tile))));
return !hiddenBlockEntities.contains(TechHider.normalizeBlockEntityId((String) getName.invoke(getKey.invoke(tileEntityTypes, entityType.get(tile)))));
}
private void blocks(SectionHider section) {
SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ProtocolWrapper18.java
+11
View File
@@ -20,8 +20,11 @@
package de.steamwar.techhider;
import de.steamwar.Reflection;
import de.steamwar.core.Core;
import net.minecraft.core.IRegistry;
import net.minecraft.core.SectionPosition;
import net.minecraft.network.protocol.game.PacketPlayOutBlockBreak;
import net.minecraft.resources.MinecraftKey;
import net.minecraft.world.level.block.entity.TileEntitySign;
import net.minecraft.world.level.block.entity.TileEntityTypes;
import net.minecraft.world.level.block.state.IBlockData;
@@ -88,6 +91,14 @@ public class ProtocolWrapper18 implements ProtocolWrapper {
return tileEntityType.get(packet) != signType;
}
private static final IRegistry<?> tileEntityTypes = Reflection.getField(Core.getVersion() > 18 ? Reflection.getClass("net.minecraft.core.registries.BuiltInRegistries") : IRegistry.class, IRegistry.class, 0, TileEntityTypes.class).get(null);
private static final Reflection.Method getKey = Reflection.getTypedMethod(IRegistry.class, null, MinecraftKey.class, Object.class);
private static final Reflection.Method getName = Reflection.getTypedMethod(MinecraftKey.class, null, String.class);
@Override
public String tileEntityDataType(Object packet) {
return TechHider.normalizeBlockEntityId((String) getName.invoke(getKey.invoke(tileEntityTypes, tileEntityType.get(packet))));
}
@Override
public BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, TechHider techHider) {
return (p, packet) -> {