LegacyConsole/4jcraft
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-15 08:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-dev' into cleanup/nullptr-replacement

Browse Source 
# Conflicts:
#	Minecraft.Client/Network/PlayerChunkMap.cpp
#	Minecraft.Client/Network/PlayerList.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp
#	Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
#	Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp
#	Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.h
#	Minecraft.Client/Platform/Extrax64Stubs.cpp
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h
#	Minecraft.Client/Player/EntityTracker.cpp
#	Minecraft.Client/Player/ServerPlayer.cpp
#	Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
#	Minecraft.Client/Textures/Packs/DLCTexturePack.cpp
#	Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
#	Minecraft.Client/Textures/Stitching/TextureMap.cpp
#	Minecraft.Client/Textures/Textures.cpp
#	Minecraft.World/Blocks/NotGateTile.cpp
#	Minecraft.World/Blocks/PressurePlateTile.cpp
#	Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp
#	Minecraft.World/Enchantments/EnchantmentHelper.cpp
#	Minecraft.World/Entities/HangingEntity.cpp
#	Minecraft.World/Entities/LeashFenceKnotEntity.cpp
#	Minecraft.World/Entities/LivingEntity.cpp
#	Minecraft.World/Entities/Mobs/Boat.cpp
#	Minecraft.World/Entities/Mobs/Minecart.cpp
#	Minecraft.World/Entities/Mobs/Witch.cpp
#	Minecraft.World/Entities/SyncedEntityData.cpp
#	Minecraft.World/Items/LeashItem.cpp
#	Minecraft.World/Items/PotionItem.cpp
#	Minecraft.World/Level/BaseMobSpawner.cpp
#	Minecraft.World/Level/CustomLevelSource.cpp
#	Minecraft.World/Level/Level.cpp
#	Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
#	Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
#	Minecraft.World/Level/Storage/RegionFileCache.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/WorldGen/Biomes/BiomeCache.cpp
#	Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp
#	Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
This commit is contained in:
MatthewBeshay
2026-03-30 16:28:40 +11:00
parent dfb0e3b03e 00cd713cc8
commit a0fdc643d1
265 changed files with 1408 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Minecraft.Client/UI/Gui.cpp
View File

@@ -933,7 +933,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
iSafezoneXHalf + 2, 20, 0xffffff);
font->drawShadow(
L"Seed: " +
_toString<__int64>(minecraft->level->getLevelData()->getSeed()),
_toString<int64_t>(minecraft->level->getLevelData()->getSeed()),
iSafezoneXHalf + 2, 32 + 00, 0xffffff);
font->drawShadow(minecraft->gatherStats1(), iSafezoneXHalf + 2, 32 + 10,
0xffffff);
@@ -1331,8 +1331,8 @@ void Gui::tick() {
// viewing the Pause Menu. We don't show the guiMessages when a menu is
// up, so don't fade them out
if (!ui.GetMenuDisplayed(iPad)) {
AUTO_VAR(itEnd, guiMessages[iPad].end());
for (AUTO_VAR(it, guiMessages[iPad].begin()); it != itEnd; it++) {
auto itEnd = guiMessages[iPad].end();
for (auto it = guiMessages[iPad].begin(); it != itEnd; it++) {
(*it).ticks++;
}
}
@@ -1506,8 +1506,8 @@ void Gui::displayClientMessage(int messageId, int iPad) {
}
// 4J Added
void Gui::renderGraph(int dataLength, int dataPos, __int64* dataA,
float dataAScale, int dataAWarning, __int64* dataB,
void Gui::renderGraph(int dataLength, int dataPos, int64_t* dataA,
float dataAScale, int dataAWarning, int64_t* dataB,
float dataBScale, int dataBWarning) {
int height = minecraft->height;
// This causes us to cover xScale*dataLength pixels in the horizontal
@@ -1541,7 +1541,7 @@ void Gui::renderGraph(int dataLength, int dataPos, __int64* dataA,
t->color(0xff000000 + cc * 256);
}
__int64 aVal = dataA[i] / dataAScale;
int64_t aVal = dataA[i] / dataAScale;
t->vertex((float)(xScale * i + 0.5f), (float)(height - aVal + 0.5f),
(float)(0));
@@ -1556,7 +1556,7 @@ void Gui::renderGraph(int dataLength, int dataPos, __int64* dataA,
t->color(0xff808080 + cc / 2 * 256);
}
__int64 bVal = dataB[i] / dataBScale;
int64_t bVal = dataB[i] / dataBScale;
t->vertex((float)(xScale * i + (xScale - 1) + 0.5f),
(float)(height - bVal + 0.5f), (float)(0));
@@ -1570,7 +1570,7 @@ void Gui::renderGraph(int dataLength, int dataPos, __int64* dataA,
}
void Gui::renderStackedGraph(int dataPos, int dataLength, int dataSources,
__int64 (*func)(unsigned int dataPos,
int64_t (*func)(unsigned int dataPos,
unsigned int dataSource)) {
int height = minecraft->height;
@@ -1587,8 +1587,8 @@ void Gui::renderStackedGraph(int dataPos, int dataLength, int dataSources,
Tesselator* t = Tesselator::getInstance();
t->begin(GL_LINES);
__int64 thisVal = 0;
__int64 topVal = 0;
int64_t thisVal = 0;
int64_t topVal = 0;
for (int i = 0; i < dataLength; i++) {
thisVal = 0;
topVal = 0;