Skip to content

Isolate hooks initialization #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Isolate hooks initialization #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 40 additions & 34 deletions src/main/java/net/elytrium/velocitytools/hooks/HooksInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
Expand Down Expand Up @@ -68,36 +68,9 @@ public static void init(ProxyServer server) {
MethodHandle versionsField = MethodHandles.privateLookupIn(StateRegistry.PacketRegistry.class, MethodHandles.lookup())
.findGetter(StateRegistry.PacketRegistry.class, "versions", Map.class);

MethodHandle packetIdToSupplierField = MethodHandles
.privateLookupIn(StateRegistry.PacketRegistry.ProtocolRegistry.class, MethodHandles.lookup())
.findGetter(StateRegistry.PacketRegistry.ProtocolRegistry.class, "packetIdToSupplier", IntObjectMap.class);

MethodHandle packetClassToIdField = MethodHandles
.privateLookupIn(StateRegistry.PacketRegistry.ProtocolRegistry.class, MethodHandles.lookup())
.findGetter(StateRegistry.PacketRegistry.ProtocolRegistry.class, "packetClassToId", Object2IntMap.class);

List<PacketHook> hooks = new ArrayList<>();
hooks.add(new PluginMessageHook());
hooks.add(new HandshakeHook());

BiConsumer<? super ProtocolVersion, ? super StateRegistry.PacketRegistry.ProtocolRegistry> consumer = (version, registry) -> {
try {
IntObjectMap<Supplier<? extends MinecraftPacket>> packetIdToSupplier
= (IntObjectMap<Supplier<? extends MinecraftPacket>>) packetIdToSupplierField.invoke(registry);

Object2IntMap<Class<? extends MinecraftPacket>> packetClassToId
= (Object2IntMap<Class<? extends MinecraftPacket>>) packetClassToIdField.invoke(registry);

hooks.forEach(hook -> {
int packetId = packetClassToId.getInt(hook.getType());
packetClassToId.put(hook.getHookClass(), packetId);
packetIdToSupplier.remove(packetId);
packetIdToSupplier.put(packetId, hook.getHook());
});
} catch (Throwable e) {
throw new ReflectionException(e);
}
};
Map<StateRegistry, List<PacketHook>> hooks = new LinkedHashMap<>();
hooks.put(StateRegistry.PLAY, List.of(new PluginMessageHook()));
hooks.put(StateRegistry.HANDSHAKE, List.of(new HandshakeHook()));

MethodHandle clientboundGetter = MethodHandles.privateLookupIn(StateRegistry.class, MethodHandles.lookup())
.findGetter(StateRegistry.class, "clientbound", StateRegistry.PacketRegistry.class);
Expand All @@ -109,11 +82,44 @@ public static void init(ProxyServer server) {
StateRegistry.PacketRegistry configClientbound = (StateRegistry.PacketRegistry) clientboundGetter.invokeExact(StateRegistry.CONFIG);
StateRegistry.PacketRegistry handshakeServerbound = (StateRegistry.PacketRegistry) serverboundGetter.invokeExact(StateRegistry.HANDSHAKE);

((Map<ProtocolVersion, StateRegistry.PacketRegistry.ProtocolRegistry>) versionsField.invokeExact(playClientbound)).forEach(consumer);
((Map<ProtocolVersion, StateRegistry.PacketRegistry.ProtocolRegistry>) versionsField.invokeExact(configClientbound)).forEach(consumer);
((Map<ProtocolVersion, StateRegistry.PacketRegistry.ProtocolRegistry>) versionsField.invokeExact(handshakeServerbound)).forEach(consumer);
((Map<ProtocolVersion, StateRegistry.PacketRegistry.ProtocolRegistry>) versionsField.invokeExact(playClientbound))
.forEach(hookInitializer(hooks.getOrDefault(StateRegistry.PLAY, List.of())));
((Map<ProtocolVersion, StateRegistry.PacketRegistry.ProtocolRegistry>) versionsField.invokeExact(configClientbound))
.forEach(hookInitializer(hooks.getOrDefault(StateRegistry.CONFIG, List.of())));
((Map<ProtocolVersion, StateRegistry.PacketRegistry.ProtocolRegistry>) versionsField.invokeExact(handshakeServerbound))
.forEach(hookInitializer(hooks.getOrDefault(StateRegistry.HANDSHAKE, List.of())));
} catch (Throwable e) {
throw new ReflectionException(e);
}
}

private static BiConsumer<ProtocolVersion, StateRegistry.PacketRegistry.ProtocolRegistry> hookInitializer(List<PacketHook> hooks)
throws IllegalAccessException, NoSuchFieldException {
MethodHandle packetIdToSupplierField = MethodHandles
.privateLookupIn(StateRegistry.PacketRegistry.ProtocolRegistry.class, MethodHandles.lookup())
.findGetter(StateRegistry.PacketRegistry.ProtocolRegistry.class, "packetIdToSupplier", IntObjectMap.class);

MethodHandle packetClassToIdField = MethodHandles
.privateLookupIn(StateRegistry.PacketRegistry.ProtocolRegistry.class, MethodHandles.lookup())
.findGetter(StateRegistry.PacketRegistry.ProtocolRegistry.class, "packetClassToId", Object2IntMap.class);

return (version, registry) -> {
try {
IntObjectMap<Supplier<? extends MinecraftPacket>> packetIdToSupplier
= (IntObjectMap<Supplier<? extends MinecraftPacket>>) packetIdToSupplierField.invoke(registry);

Object2IntMap<Class<? extends MinecraftPacket>> packetClassToId
= (Object2IntMap<Class<? extends MinecraftPacket>>) packetClassToIdField.invoke(registry);

hooks.forEach(hook -> {
int packetId = packetClassToId.getInt(hook.getType());
packetClassToId.put(hook.getHookClass(), packetId);
packetIdToSupplier.remove(packetId);
packetIdToSupplier.put(packetId, hook.getHook());
});
} catch (Throwable e) {
throw new ReflectionException(e);
}
};
}
}