mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/LCE-Revelations.git
synced 2026-06-03 17:57:21 +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
237 lines
6.3 KiB
C++
237 lines
6.3 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.item.h"
|
|
#include "net.minecraft.world.entity.item.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "net.minecraft.world.h"
|
|
#include "..\Minecraft.Client\Minecraft.h"
|
|
#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
|
|
#include "StemTile.h"
|
|
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
|
|
#include "..\Minecraft.Server\FourKitBridge.h"
|
|
#include "Dimension.h"
|
|
#endif
|
|
|
|
const wstring StemTile::TEXTURE_ANGLED = L"stem_bent";
|
|
|
|
StemTile::StemTile(int id, Tile *fruit) : Bush(id)
|
|
{
|
|
this->fruit = fruit;
|
|
|
|
setTicking(true);
|
|
float ss = 0.125f;
|
|
this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, 0.25f, 0.5f + ss);
|
|
|
|
iconAngled = nullptr;
|
|
}
|
|
|
|
bool StemTile::mayPlaceOn(int tile)
|
|
{
|
|
return tile == Tile::farmland_Id;
|
|
}
|
|
|
|
void StemTile::tick(Level *level, int x, int y, int z, Random *random)
|
|
{
|
|
Tile::tick(level, x, y, z, random);
|
|
if (level->getRawBrightness(x, y + 1, z) >= Level::MAX_BRIGHTNESS - 6)
|
|
{
|
|
|
|
float growthSpeed = getGrowthSpeed(level, x, y, z);
|
|
|
|
// 4J Stu - Brought forward change from 1.2.3 to make fruit more likely to grow
|
|
if (random->nextInt(static_cast<int>(25 / growthSpeed) + 1) == 0)
|
|
{
|
|
int age = level->getData(x, y, z);
|
|
if (age < 7)
|
|
{
|
|
age++;
|
|
level->setData(x, y, z, age, Tile::UPDATE_CLIENTS);
|
|
}
|
|
else
|
|
{
|
|
if (level->getTile(x - 1, y, z) == fruit->id) return;
|
|
if (level->getTile(x + 1, y, z) == fruit->id) return;
|
|
if (level->getTile(x, y, z - 1) == fruit->id) return;
|
|
if (level->getTile(x, y, z + 1) == fruit->id) return;
|
|
|
|
int dir = random->nextInt(4);
|
|
int xx = x;
|
|
int zz = z;
|
|
if (dir == 0) xx--;
|
|
if (dir == 1) xx++;
|
|
if (dir == 2) zz--;
|
|
if (dir == 3) zz++;
|
|
// 4J Stu - Brought forward change from 1.2.3 to not require farmland to grow fruits
|
|
int below = level->getTile(xx, y - 1, zz);
|
|
if (level->getTile(xx, y, zz) == 0 && (below == Tile::farmland_Id || below == Tile::dirt_Id || below == Tile::grass_Id))
|
|
{
|
|
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
|
|
if (!FourKitBridge::FireBlockGrow(level->dimension->id, xx, y, zz, fruit->id, 0))
|
|
#endif
|
|
level->setTileAndUpdate(xx, y, zz, fruit->id);
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
void StemTile::growCrops(Level *level, int x, int y, int z)
|
|
{
|
|
int stage = level->getData(x, y, z) + Mth::nextInt(level->random, 2, 5);
|
|
if (stage > 7) stage = 7;
|
|
level->setData(x, y, z, stage, Tile::UPDATE_CLIENTS);
|
|
}
|
|
|
|
float StemTile::getGrowthSpeed(Level *level, int x, int y, int z)
|
|
{
|
|
float speed = 1;
|
|
|
|
int n = level->getTile(x, y, z - 1);
|
|
int s = level->getTile(x, y, z + 1);
|
|
int w = level->getTile(x - 1, y, z);
|
|
int e = level->getTile(x + 1, y, z);
|
|
|
|
int d0 = level->getTile(x - 1, y, z - 1);
|
|
int d1 = level->getTile(x + 1, y, z - 1);
|
|
int d2 = level->getTile(x + 1, y, z + 1);
|
|
int d3 = level->getTile(x - 1, y, z + 1);
|
|
|
|
bool horizontal = w == id || e == id;
|
|
bool vertical = n == id || s == id;
|
|
bool diagonal = d0 == id || d1 == id || d2 == id || d3 == id;
|
|
|
|
for (int xx = x - 1; xx <= x + 1; xx++)
|
|
for (int zz = z - 1; zz <= z + 1; zz++)
|
|
{
|
|
int t = level->getTile(xx, y - 1, zz);
|
|
|
|
float tileSpeed = 0;
|
|
if (t == Tile::farmland_Id)
|
|
{
|
|
tileSpeed = 1;
|
|
if (level->getData(xx, y - 1, zz) > 0) tileSpeed = 3;
|
|
}
|
|
|
|
if (xx != x || zz != z) tileSpeed /= 4;
|
|
|
|
speed += tileSpeed;
|
|
}
|
|
|
|
if (diagonal || (horizontal && vertical)) speed /= 2;
|
|
|
|
return speed;
|
|
}
|
|
|
|
int StemTile::getColor(int data)
|
|
{
|
|
//int r = data * 32;
|
|
//int g = 255 - data * 8;
|
|
//int b = data * 4;
|
|
//return r << 16 | g << 8 | b;
|
|
|
|
int colour = 0;
|
|
|
|
unsigned int minColour = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Tile_StemMin );
|
|
unsigned int maxColour = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Tile_StemMax );
|
|
|
|
byte redComponent = ((minColour>>16)&0xFF) + (( (maxColour>>16)&0xFF - (minColour>>16)&0xFF)*( data/7.0f));
|
|
byte greenComponent = ((minColour>>8)&0xFF) + (( (maxColour>>8)&0xFF - (minColour>>8)&0xFF)*( data/7.0f));
|
|
byte blueComponent = ((minColour)&0xFF) + (( (maxColour)&0xFF - (minColour)&0xFF)*( data/7.0f));
|
|
|
|
colour = redComponent<<16 | greenComponent<<8 | blueComponent;
|
|
return colour;
|
|
}
|
|
|
|
int StemTile::getColor(LevelSource *level, int x, int y, int z)
|
|
{
|
|
return getColor(level->getData(x, y, z));
|
|
}
|
|
|
|
void StemTile::updateDefaultShape()
|
|
{
|
|
float ss = 0.125f;
|
|
setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, 0.25f, 0.5f + ss);
|
|
}
|
|
|
|
void StemTile::updateShape(LevelSource *level, int x, int y, int z, int forceData, shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
|
|
{
|
|
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
|
tls->yy1 = (level->getData(x, y, z) * 2 + 2) / 16.0f;
|
|
float ss = 0.125f;
|
|
setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, static_cast<float>(tls->yy1), 0.5f + ss);
|
|
}
|
|
|
|
int StemTile::getRenderShape()
|
|
{
|
|
return Tile::SHAPE_STEM;
|
|
}
|
|
|
|
int StemTile::getConnectDir(LevelSource *level, int x, int y, int z)
|
|
{
|
|
int d = level->getData(x, y, z);
|
|
if (d < 7) return -1;
|
|
if (level->getTile(x - 1, y, z) == fruit->id) return 0;
|
|
if (level->getTile(x + 1, y, z) == fruit->id) return 1;
|
|
if (level->getTile(x, y, z - 1) == fruit->id) return 2;
|
|
if (level->getTile(x, y, z + 1) == fruit->id) return 3;
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Using this method instead of destroy() to determine if seeds should be
|
|
* dropped
|
|
*/
|
|
void StemTile::spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonus)
|
|
{
|
|
Tile::spawnResources(level, x, y, z, data, odds, playerBonus);
|
|
|
|
if (level->isClientSide)
|
|
{
|
|
return;
|
|
}
|
|
|
|
Item *seed = nullptr;
|
|
if (fruit == Tile::pumpkin) seed = Item::seeds_pumpkin;
|
|
if (fruit == Tile::melon) seed = Item::seeds_melon;
|
|
if (seed != nullptr)
|
|
{
|
|
popResource(level, x, y, z, std::make_shared<ItemInstance>(seed));
|
|
}
|
|
}
|
|
|
|
int StemTile::getResource(int data, Random *random, int playerBonusLevel)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
int StemTile::getResourceCount(Random *random)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
int StemTile::cloneTileId(Level *level, int x, int y, int z)
|
|
{
|
|
if (fruit == Tile::pumpkin)
|
|
{
|
|
return Item::seeds_pumpkin_Id;
|
|
}
|
|
else if (fruit == Tile::melon)
|
|
{
|
|
return Item::seeds_melon_Id;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void StemTile::registerIcons(IconRegister *iconRegister)
|
|
{
|
|
icon = iconRegister->registerIcon(L"stem_straight");
|
|
iconAngled = iconRegister->registerIcon(TEXTURE_ANGLED);
|
|
}
|
|
|
|
Icon *StemTile::getAngledTexture()
|
|
{
|
|
return iconAngled;
|
|
}
|