mirror of
https://git.revela.dev/itsRevela/LCE-Revelations.git
synced 2026-05-22 03:36:14 +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
191 lines
4.6 KiB
C++
191 lines
4.6 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "net.minecraft.world.level.tile.h"
|
|
#include "net.minecraft.world.level.levelgen.feature.h"
|
|
#include "net.minecraft.world.h"
|
|
#include "Dimension.h"
|
|
#include "Sapling.h"
|
|
|
|
#if defined(_WINDOWS64)
|
|
#include "../Minecraft.Server/FourKitBridge.h"
|
|
#endif
|
|
|
|
|
|
int Sapling::SAPLING_NAMES[SAPLING_NAMES_SIZE] = { IDS_TILE_SAPLING_OAK,
|
|
IDS_TILE_SAPLING_SPRUCE,
|
|
IDS_TILE_SAPLING_BIRCH,
|
|
IDS_TILE_SAPLING_JUNGLE
|
|
};
|
|
|
|
const wstring Sapling::TEXTURE_NAMES[] = {L"sapling", L"sapling_spruce", L"sapling_birch", L"sapling_jungle"};
|
|
|
|
Sapling::Sapling(int id) : Bush( id )
|
|
{
|
|
this->updateDefaultShape();
|
|
icons = nullptr;
|
|
}
|
|
|
|
// 4J Added override
|
|
void Sapling::updateDefaultShape()
|
|
{
|
|
float ss = 0.4f;
|
|
this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, ss * 2, 0.5f + ss);
|
|
}
|
|
|
|
void Sapling::tick(Level *level, int x, int y, int z, Random *random)
|
|
{
|
|
if (level->isClientSide) return;
|
|
|
|
Bush::tick(level, x, y, z, random);
|
|
|
|
if (level->getRawBrightness(x, y + 1, z) >= Level::MAX_BRIGHTNESS - 6)
|
|
{
|
|
if (random->nextInt(7) == 0)
|
|
{
|
|
advanceTree(level, x, y, z, random);
|
|
}
|
|
}
|
|
}
|
|
|
|
Icon *Sapling::getTexture(int face, int data)
|
|
{
|
|
data = data & TYPE_MASK;
|
|
return icons[data];
|
|
}
|
|
void Sapling::advanceTree(Level* level, int x, int y, int z, Random* random, bool naturalGrowth, int entityId)
|
|
{
|
|
int data = level->getData(x, y, z);
|
|
if ((data & AGE_BIT) == 0)
|
|
{
|
|
level->setData(x, y, z, data | AGE_BIT, Tile::UPDATE_NONE);
|
|
}
|
|
else
|
|
{
|
|
growTree(level, x, y, z, random, naturalGrowth, entityId);
|
|
}
|
|
}
|
|
void Sapling::growTree(Level* level, int x, int y, int z, Random* random, bool naturalGrowth, int entityId)
|
|
{
|
|
int data = level->getData(x, y, z) & TYPE_MASK;
|
|
|
|
Feature *f = nullptr;
|
|
|
|
int ox = 0, oz = 0;
|
|
bool multiblock = false;
|
|
|
|
if (data == TYPE_EVERGREEN)
|
|
{
|
|
f = new SpruceFeature(true);
|
|
}
|
|
else if (data == TYPE_BIRCH)
|
|
{
|
|
f = new BirchFeature(true);
|
|
}
|
|
else if (data == TYPE_JUNGLE)
|
|
{
|
|
// check for mega tree
|
|
for (ox = 0; ox >= -1; ox--)
|
|
{
|
|
for (oz = 0; oz >= -1; oz--)
|
|
{
|
|
if (isSapling(level, x + ox, y, z + oz, TYPE_JUNGLE) && isSapling(level, x + ox + 1, y, z + oz, TYPE_JUNGLE) && isSapling(level, x + ox, y, z + oz + 1, TYPE_JUNGLE)
|
|
&& isSapling(level, x + ox + 1, y, z + oz + 1, TYPE_JUNGLE))
|
|
{
|
|
f = new MegaTreeFeature(true, 10 + random->nextInt(20), TreeTile::JUNGLE_TRUNK, LeafTile::JUNGLE_LEAF);
|
|
multiblock = true;
|
|
break;
|
|
}
|
|
}
|
|
if (f != nullptr)
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
if (f == nullptr)
|
|
{
|
|
ox = oz = 0;
|
|
f = new TreeFeature(true, 4 + random->nextInt(7), TreeTile::JUNGLE_TRUNK, LeafTile::JUNGLE_LEAF, false);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
f = new TreeFeature(true);
|
|
if (random->nextInt(10) == 0)
|
|
{
|
|
delete f;
|
|
f = new BasicTree(true);
|
|
}
|
|
}
|
|
if (multiblock)
|
|
{
|
|
level->setTileAndData(x + ox, y, z + oz, 0, 0, Tile::UPDATE_NONE);
|
|
level->setTileAndData(x + ox + 1, y, z + oz, 0, 0, Tile::UPDATE_NONE);
|
|
level->setTileAndData(x + ox, y, z + oz + 1, 0, 0, Tile::UPDATE_NONE);
|
|
level->setTileAndData(x + ox + 1, y, z + oz + 1, 0, 0, Tile::UPDATE_NONE);
|
|
}
|
|
else
|
|
{
|
|
level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_NONE);
|
|
}
|
|
|
|
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
|
|
int TreeType = data;
|
|
if (data != TYPE_EVERGREEN && data != TYPE_BIRCH && data != TYPE_JUNGLE) {
|
|
if (dynamic_cast<BasicTree*>(f) != nullptr) {
|
|
TreeType = 4; //large tree
|
|
}
|
|
else {
|
|
TreeType = 5; //normal tree
|
|
}
|
|
}
|
|
|
|
if (FourKitBridge::FireStructureGrow(level->dimension->id, x, y, z, TreeType, !naturalGrowth, entityId)) {
|
|
if (f != nullptr) delete f;
|
|
f = nullptr;
|
|
}
|
|
#endif
|
|
|
|
if (f == nullptr || !f->place(level, random, x + ox, y, z + oz))
|
|
{
|
|
if (multiblock)
|
|
{
|
|
level->setTileAndData(x + ox, y, z + oz, id, data, Tile::UPDATE_NONE);
|
|
level->setTileAndData(x + ox + 1, y, z + oz, id, data, Tile::UPDATE_NONE);
|
|
level->setTileAndData(x + ox, y, z + oz + 1, id, data, Tile::UPDATE_NONE);
|
|
level->setTileAndData(x + ox + 1, y, z + oz + 1, id, data, Tile::UPDATE_NONE);
|
|
}
|
|
else
|
|
{
|
|
level->setTileAndData(x, y, z, id, data, Tile::UPDATE_NONE);
|
|
}
|
|
}
|
|
if( f != nullptr )
|
|
delete f;
|
|
}
|
|
|
|
unsigned int Sapling::getDescriptionId(int iData /*= -1*/)
|
|
{
|
|
if(iData < 0 ) iData = 0;
|
|
return Sapling::SAPLING_NAMES[iData];
|
|
}
|
|
|
|
int Sapling::getSpawnResourcesAuxValue(int data)
|
|
{
|
|
return data & TYPE_MASK;
|
|
}
|
|
|
|
bool Sapling::isSapling(Level *level, int x, int y, int z, int type)
|
|
{
|
|
return (level->getTile(x, y, z) == id) && ((level->getData(x, y, z) & TYPE_MASK) == type);
|
|
}
|
|
|
|
void Sapling::registerIcons(IconRegister *iconRegister)
|
|
{
|
|
icons = new Icon*[SAPLING_NAMES_SIZE];
|
|
|
|
for (int i = 0; i < SAPLING_NAMES_SIZE; i++)
|
|
{
|
|
icons[i] = iconRegister->registerIcon(TEXTURE_NAMES[i]);
|
|
}
|
|
}
|