mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/LCE-Revelations.git
synced 2026-05-22 14:44:50 +00:00
Adds the FourKit .NET 10 plugin host as a second dedicated server
build flavour alongside the existing vanilla server. Both flavours
build from the same source tree, with FourKit gated by the
MINECRAFT_SERVER_FOURKIT_BUILD preprocessor define.
Build layout:
Minecraft.Server vanilla, no plugin support, no .NET dep
Minecraft.Server.FourKit FourKit-enabled, ships with bundled
.NET 10 self-contained runtime in runtime/
and an empty plugins/ folder
Both produce a Minecraft.Server.exe in their own per-target output
dir. The variant identity lives in the directory name, not the
binary name, so either flavour can be shipped as a drop-in.
Native bridge (Minecraft.Server/FourKit*.{cpp,h}):
* FourKitRuntime: hosts CoreCLR via hostfxr's command-line init API
(the runtime-config API does not support self-contained components)
* FourKitBridge: ~50 Fire* event entry points, with inline no-op
stubs for the standalone build so gameplay code can call them
unconditionally
* FourKitNatives: ~80 native callbacks the managed side invokes
for player/world/inventory mutations
* FourKitMappers: type and enum mapping helpers
Managed plugin host (Minecraft.Server.FourKit/):
* Bukkit-style API: Player, World, Block, Inventory, Command,
Listener, EventHandler attribute, ~54 event classes
* PluginLoader with per-plugin AssemblyLoadContext
* FourKitHost as the [UnmanagedCallersOnly] entry point table
* Runtime resolves plugins relative to the host process so they
always live next to Minecraft.Server.exe regardless of where the
managed assembly itself is loaded from
Engine hooks (Minecraft.Client/, Minecraft.World/):
* Player lifecycle (PreLogin, Login, Join, Quit, Kick, Move,
Teleport, Portal, Death) wired into PendingConnection and
PlayerConnection without disturbing the cipher handshake or
identity-token security flow
* Inventory open/click/drop hooks across every container menu type
* Block place/break/grow/burn/spread/from-to hooks across the
full tile family
* Bed enter/leave, sign change, entity damage/death, ender pearl
teleport hooks
Regression fixes preserved while applying donor diffs:
* ServerPlayer::die() retains the LCE-Revelations hardcore branch
(setGameMode(ADVENTURE) + banPlayerForHardcoreDeath) in both the
FourKit and non-FourKit code paths
* ServerLevel::entityAdded() retains the sub-entity ID reassignment
loop required by the client's handleAddMob offset, fixing Ender
Dragon and Wither boss multi-part hit detection
* LivingEntity::travel() retains the raw Player* cast and the
cached frictionTile, both Revelations perf wins that the donor
silently reverted
* ServerLogger.cpp keeps the file-logging code donor stripped
* PlayerList.cpp end portal transition fix and UIScene_EndPoem
bounds-check are intact
Build system:
* Top-level CMakeLists.txt adds the Minecraft.Server.FourKit
subdirectory and pulls in the new shared cmake/ServerTarget.cmake
helper
* Minecraft.Server/cmake/sources/Common.cmake is now location
independent (uses CMAKE_CURRENT_LIST_DIR) so the source list
can be consumed from either server target's CMakeLists.txt
* The seven FourKit*.cpp/h files live in their own
_MINECRAFT_SERVER_COMMON_SERVER_FOURKIT variable so the
standalone target omits them
* configure-time .NET 10 SDK check fails fast with a clear
download link if the SDK is missing
* global.json pins the SDK to 10.0.100 with latestFeature
rollforward
Sample plugin (samples/HelloPlugin/) demonstrates the loader and
the PlayerJoinEvent listener pattern.
CI:
* nightly.yml builds both server flavours, ships
LCE-Revelations-Server-Win64.zip and
LCE-Revelations-Server-Win64-FourKit.zip, attests both, and
updates release notes for the dual-flavour layout
* pull-request.yml pulls in actions/setup-dotnet so the FourKit
publish step works in PR validation
* All zip artifacts and the client zip are renamed from
LCREWindows64 to LCE-Revelations-{Client,Server}-Win64
Documentation:
* COMPILE.md gets a VS 2022 quick start, .NET 10 prereq section,
server flavours explanation, and a troubleshooting section
* docs/FOURKIT_PORT_RECON.md captures the file-by-file recon that
drove the port
* docs/FOURKIT_PARITY.md is the canonical reference for which
events FourKit fires
Docker:
* docker-compose.dedicated-server.yml MC_RUNTIME_DIR default points
at the vanilla CMake output. The FourKit Docker image is
intentionally NOT shipped yet because hosting .NET 10 self
contained inside Wine has not been smoke-tested
107 lines
3.8 KiB
C++
107 lines
3.8 KiB
C++
#include "stdafx.h"
|
|
#include "MinecraftServer.h"
|
|
#include "PlayerList.h"
|
|
#include "ServerPlayer.h"
|
|
#include "PlayerConnection.h"
|
|
#include "..\Minecraft.World\net.minecraft.commands.h"
|
|
#include "..\Minecraft.World\net.minecraft.network.packet.h"
|
|
#include "..\Minecraft.World\net.minecraft.world.level.h"
|
|
#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
|
|
#include "TeleportCommand.h"
|
|
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
|
|
#include "..\Minecraft.Server\FourKitBridge.h"
|
|
#endif
|
|
|
|
EGameCommand TeleportCommand::getId()
|
|
{
|
|
return eGameCommand_Teleport;
|
|
}
|
|
|
|
void TeleportCommand::execute(shared_ptr<CommandSender> source, byteArray commandData)
|
|
{
|
|
ByteArrayInputStream bais(commandData);
|
|
DataInputStream dis(&bais);
|
|
|
|
PlayerUID subjectID = dis.readPlayerUID();
|
|
PlayerUID destinationID = dis.readPlayerUID();
|
|
|
|
bais.reset();
|
|
|
|
PlayerList *players = MinecraftServer::getInstance()->getPlayerList();
|
|
|
|
shared_ptr<ServerPlayer> subject = players->getPlayer(subjectID);
|
|
shared_ptr<ServerPlayer> destination = players->getPlayer(destinationID);
|
|
|
|
if(subject != nullptr && destination != nullptr && subject->level->dimension->id == destination->level->dimension->id && subject->isAlive() )
|
|
{
|
|
subject->ride(nullptr);
|
|
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
|
|
{
|
|
double outX, outY, outZ;
|
|
bool cancelled = FourKitBridge::FirePlayerTeleport(subject->entityId,
|
|
subject->x, subject->y, subject->z, subject->dimension,
|
|
destination->x, destination->y, destination->z, destination->dimension,
|
|
1 /* COMMAND */,
|
|
&outX, &outY, &outZ);
|
|
if (cancelled)
|
|
return;
|
|
subject->connection->teleport(outX, outY, outZ, destination->yRot, destination->xRot);
|
|
}
|
|
#else
|
|
subject->connection->teleport(destination->x, destination->y, destination->z, destination->yRot, destination->xRot);
|
|
#endif
|
|
//logAdminAction(source, "commands.tp.success", subject->getAName(), destination->getAName());
|
|
logAdminAction(source, ChatPacket::e_ChatCommandTeleportSuccess, subject->getName(), eTYPE_SERVERPLAYER, destination->getName());
|
|
|
|
if(subject == source)
|
|
{
|
|
destination->sendMessage(subject->getName(), ChatPacket::e_ChatCommandTeleportToMe);
|
|
}
|
|
else
|
|
{
|
|
subject->sendMessage(destination->getName(), ChatPacket::e_ChatCommandTeleportMe);
|
|
}
|
|
}
|
|
|
|
//if (args.length >= 1) {
|
|
// MinecraftServer server = MinecraftServer.getInstance();
|
|
// ServerPlayer victim;
|
|
|
|
// if (args.length == 2 || args.length == 4) {
|
|
// victim = server.getPlayers().getPlayer(args[0]);
|
|
// if (victim == null) throw new PlayerNotFoundException();
|
|
// } else {
|
|
// victim = (ServerPlayer) convertSourceToPlayer(source);
|
|
// }
|
|
|
|
// if (args.length == 3 || args.length == 4) {
|
|
// if (victim.level != null) {
|
|
// int pos = args.length - 3;
|
|
// int maxPos = Level.MAX_LEVEL_SIZE;
|
|
// int x = convertArgToInt(source, args[pos++], -maxPos, maxPos);
|
|
// int y = convertArgToInt(source, args[pos++], Level.minBuildHeight, Level.maxBuildHeight);
|
|
// int z = convertArgToInt(source, args[pos++], -maxPos, maxPos);
|
|
|
|
// victim.teleportTo(x + 0.5f, y, z + 0.5f);
|
|
// logAdminAction(source, "commands.tp.coordinates", victim.getAName(), x, y, z);
|
|
// }
|
|
// } else if (args.length == 1 || args.length == 2) {
|
|
// ServerPlayer destination = server.getPlayers().getPlayer(args[args.length - 1]);
|
|
// if (destination == null) throw new PlayerNotFoundException();
|
|
|
|
// victim.connection.teleport(destination.x, destination.y, destination.z, destination.yRot, destination.xRot);
|
|
// logAdminAction(source, "commands.tp.success", victim.getAName(), destination.getAName());
|
|
// }
|
|
//}
|
|
}
|
|
|
|
shared_ptr<GameCommandPacket> TeleportCommand::preparePacket(PlayerUID subject, PlayerUID destination)
|
|
{
|
|
ByteArrayOutputStream baos;
|
|
DataOutputStream dos(&baos);
|
|
|
|
dos.writePlayerUID(subject);
|
|
dos.writePlayerUID(destination);
|
|
|
|
return std::make_shared<GameCommandPacket>(eGameCommand_Teleport, baos.toByteArray());
|
|
} |