ZSCGR/4jcraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

game compiles

Browse Source
This commit is contained in:
JuiceyDev
2026-03-06 06:13:22 +01:00
parent 5b45dacb1c
commit c55ed7b261
16 changed files with 121 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Blocks/Tile.h
+2 -2
View File
@@ -560,7 +560,7 @@ public:
virtual void onRemove(Level *level, int x, int y, int z, int id, int data);
virtual int getResourceCount(Random *random);
virtual int getResource(int data, Random *random, int playerBonusLevel);
virtual float getDestroyProgress(shared_ptr<Player> player, Level *level, int x, int y, int z);
virtual float getDestroyProgress(shared_ptr<Player> player, Level *level = nullptr, int x = 0, int y = 0, int z = 0);
virtual void spawnResources(Level *level, int x, int y, int z, int data, int playerBonusLevel);
virtual void spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonusLevel);
protected:
@@ -582,7 +582,7 @@ public:
virtual bool mayPlace(Level *level, int x, int y, int z);
virtual bool TestUse();
virtual bool TestUse(Level *level, int x, int y, int z, shared_ptr<Player> player);
virtual bool use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly = false); // 4J added soundOnly param
virtual bool use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace = 0, float clickX = 0.0f, float clickY = 0.0f, float clickZ = 0.0f, bool soundOnly = false); // 4J added soundOnly param
virtual void stepOn(Level *level, int x, int y, int z, shared_ptr<Entity> entity);
virtual int getPlacedOnFaceDataValue(Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, int itemValue);
virtual void prepareRender(Level *level, int x, int y, int z);
Minecraft.World/Build/stdafx.h
+6 -4
View File
@@ -239,12 +239,14 @@ void MemSect(int sect);
#include "../../Minecraft.Client/Platform/PSVita/Sentient/SentientManager.h"
#include "../../Minecraft.Client/Platform/PSVita/Sentient/MinecraftTelemetry.h"
#elif defined(__linux__)
// FIXME: Move and port to ../Minecraft.Client/Linux
// Use Orbis-compatible headers on Linux (same as Minecraft.Client/Build/stdafx.h).
// All Orbis Sentient headers have #pragma once, preventing double-inclusion
// when DLC/other Common files also pull in Minecraft.Client stdafx.h.
#include "../../Minecraft.Client/Platform/Linux/Linux_App.h"
#include "../../Minecraft.Client/Platform/OrbisMedia/strings.h"
#include "../../Minecraft.Client/Platform/Xbox/Sentient/SentientTelemetryCommon.h"
#include "../../Minecraft.Client/Platform/Xbox/Sentient/DynamicConfigurations.h"
#include "../../Minecraft.Client/Platform/Xbox/GameConfig/Minecraft.spa.h"
#include "../../Minecraft.Client/Platform/Orbis/Sentient/SentientTelemetryCommon.h"
#include "../../Minecraft.Client/Platform/Orbis/Sentient/DynamicConfigurations.h"
#include "../../Minecraft.Client/Platform/Orbis/GameConfig/Minecraft.spa.h"
// #include "../../Minecraft.Client/Platform/Windows64/Sentient/MinecraftTelemetry.h"
#else
#include "../../Minecraft.Client/Platform/Orbis/Orbis_App.h"
Minecraft.World/Items/ItemInstance.h
+1 -1
View File
@@ -69,7 +69,7 @@ public:
Item *getItem() const;
Icon *getIcon();
int getIconType();
bool useOn(shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly=false);
bool useOn(shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX = 0.0f, float clickY = 0.0f, float clickZ = 0.0f, bool bTestUseOnOnly=false);
float getDestroySpeed(Tile *tile);
bool TestUse(Level *level, shared_ptr<Player> player);
shared_ptr<ItemInstance> use(Level *level, shared_ptr<Player> player);
Minecraft.World/meson.build
+3
View File
@@ -24,7 +24,10 @@ lib_world = static_library('Minecraft.World',
],
)
dep_zlib = dependency('zlib')
world_dep = declare_dependency(
link_with : lib_world,
dependencies : [dep_zlib],
include_directories : include_directories('Build/x64headers'),
)