str1k3r/MCLEClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream/main into main

Browse Source 
Brings in dedicated server software, README updates, and .vscode cleanup
while preserving hardcore mode, screenshot, and watermark toggle features.
This commit is contained in:
Revela
2026-03-15 03:54:37 -05:00
parent 6aea7c4bb7 b415a6bf6b
commit f0495c546c
112 changed files with 39006 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/CompressedTileStorage.cpp
+2 -2
View File
@@ -1311,7 +1311,7 @@ int CompressedTileStorage::getHighestNonEmptyY()
// Multiply by the number of vertical tiles in a block, and then add that again to be at the top of the block
highestNonEmptyY = (highestYBlock * 4) + 4;
}
else
else if( allocatedSize != 1024 )
{
app.DebugPrintf("[CTS-WARN] getHighestNonEmptyY() returned -1! allocatedSize=%d indicesAndData=%p\n",
allocatedSize, indicesAndData);
@@ -1380,4 +1380,4 @@ void CompressedTileStorage::reverseIndices(unsigned char *indices)
{
System::ReverseUSHORT(&blockIndices[i]);
}
}
}
Minecraft.World/MapItemSavedData.cpp
+24 -4
View File
@@ -12,6 +12,28 @@
const int MapItemSavedData::END_PORTAL_DECORATION_KEY = -1;
namespace
{
// Valid player icon slots in mapicons.png/additionalmapicons.png.
// Keep to these slots so we never sample placeholder entries.
static const char PLAYER_MAP_ICON_SLOTS[] = { 0, 1, 2, 3, 8, 9, 10, 11 };
static char getRandomPlayerMapIcon(const shared_ptr<Player>& player)
{
// use seed bit shift random
unsigned int seed = static_cast<unsigned int>(player->entityId);
seed ^= static_cast<unsigned int>(player->getPlayerIndex() * 0x9E3779B9u);
seed ^= (seed >> 16);
seed *= 0x7FEB352Du;
seed ^= (seed >> 15);
seed *= 0x846CA68Bu;
seed ^= (seed >> 16);
return PLAYER_MAP_ICON_SLOTS[seed % (sizeof(PLAYER_MAP_ICON_SLOTS) / sizeof(PLAYER_MAP_ICON_SLOTS[0]))];
}
}
// 4J added entityId param
MapItemSavedData::MapDecoration::MapDecoration(char img, char x, char y, char rot, int entityId, bool visible)
{
@@ -423,16 +445,14 @@ void MapItemSavedData::tickCarriedBy(shared_ptr<Player> player, shared_ptr<ItemI
// 4J Stu - As we have added new icons for players on a new row below
// other icons used in Java we need to move our index to the next row
imgIndex = static_cast<int>(decorationPlayer->getPlayerIndex());
if(imgIndex>3) imgIndex += 4;
imgIndex = getRandomPlayerMapIcon(decorationPlayer);
}
#ifdef _LARGE_WORLDS
else //if (abs(xd) < MAP_SIZE * 5 && abs(yd) < MAP_SIZE * 5)
{
// 4J Stu - As we have added new icons for players on a new row below
// other icons used in Java we need to move our index to the next row
imgIndex = static_cast<int>(decorationPlayer->getPlayerIndex());
if(imgIndex>3) imgIndex += 4;
imgIndex = getRandomPlayerMapIcon(decorationPlayer);
imgIndex += 16; // Add 16 to indicate that it's on the next texture
rot = 0;