mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/LCE-Revelations.git
synced 2026-06-07 16:46:52 +00:00
42a582fb9f
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
123 lines
2.6 KiB
C++
123 lines
2.6 KiB
C++
#include "stdafx.h"
|
|
#include "NetherWartTile.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "net.minecraft.world.level.biome.h"
|
|
#include "net.minecraft.world.item.h"
|
|
#include "net.minecraft.world.h"
|
|
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
|
|
#include "..\Minecraft.Server\FourKitBridge.h"
|
|
#include "Dimension.h"
|
|
#endif
|
|
|
|
NetherWartTile::NetherWartTile(int id) : Bush(id)
|
|
{
|
|
setTicking(true);
|
|
updateDefaultShape();
|
|
}
|
|
|
|
// 4J Added override
|
|
void NetherWartTile::updateDefaultShape()
|
|
{
|
|
float ss = 0.5f;
|
|
setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, 0.25f, 0.5f + ss);
|
|
}
|
|
|
|
bool NetherWartTile::mayPlaceOn(int tile)
|
|
{
|
|
return tile == Tile::soulsand_Id;
|
|
}
|
|
|
|
// Brought forward to fix #60073 - TU7: Content: Gameplay: Nether Warts cannot be placed next to each other in the Nether
|
|
bool NetherWartTile::canSurvive(Level *level, int x, int y, int z)
|
|
{
|
|
return mayPlaceOn(level->getTile(x, y - 1, z));
|
|
}
|
|
|
|
void NetherWartTile::tick(Level *level, int x, int y, int z, Random *random)
|
|
{
|
|
int age = level->getData(x, y, z);
|
|
if (age < MAX_AGE)
|
|
{
|
|
if (random->nextInt(10) == 0)
|
|
{
|
|
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
|
|
if (FourKitBridge::FireBlockGrow(level->dimension->id, x, y, z, level->getTile(x, y, z), age + 1))
|
|
{
|
|
return;
|
|
}
|
|
#endif
|
|
age++;
|
|
level->setData(x, y, z, age, Tile::UPDATE_CLIENTS);
|
|
}
|
|
}
|
|
|
|
Bush::tick(level, x, y, z, random);
|
|
}
|
|
|
|
void NetherWartTile::growCropsToMax(Level *level, int x, int y, int z)
|
|
{
|
|
level->setData(x, y, z, MAX_AGE, Tile::UPDATE_CLIENTS);
|
|
}
|
|
|
|
Icon *NetherWartTile::getTexture(int face, int data)
|
|
{
|
|
if (data >= MAX_AGE)
|
|
{
|
|
return icons[2];
|
|
}
|
|
if (data > 0)
|
|
{
|
|
return icons[1];
|
|
}
|
|
return icons[0];
|
|
}
|
|
|
|
int NetherWartTile::getRenderShape()
|
|
{
|
|
return Tile::SHAPE_ROWS;
|
|
}
|
|
|
|
void NetherWartTile::spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonus)
|
|
{
|
|
if (level->isClientSide)
|
|
{
|
|
return;
|
|
}
|
|
int count = 1;
|
|
if (data >= MAX_AGE)
|
|
{
|
|
count = 2 + level->random->nextInt(3);
|
|
if (playerBonus > 0)
|
|
{
|
|
count += level->random->nextInt(playerBonus + 1);
|
|
}
|
|
}
|
|
for (int i = 0; i < count; i++)
|
|
{
|
|
popResource(level, x, y, z, std::make_shared<ItemInstance>(Item::netherwart_seeds));
|
|
}
|
|
}
|
|
|
|
int NetherWartTile::getResource(int data, Random *random, int playerBonusLevel)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int NetherWartTile::getResourceCount(Random *random)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int NetherWartTile::cloneTileId(Level *level, int x, int y, int z)
|
|
{
|
|
return Item::netherwart_seeds_Id;
|
|
}
|
|
|
|
void NetherWartTile::registerIcons(IconRegister *iconRegister)
|
|
{
|
|
for (int i = 0; i < NETHER_STALK_TEXTURE_COUNT; i++)
|
|
{
|
|
icons[i] = iconRegister->registerIcon(getIconName() + L"_stage_" + std::to_wstring(i) );
|
|
}
|
|
}
|