Skip to content

Commit

Permalink
Merge branch 'develop' into BiomeDecorationFeature
Browse files Browse the repository at this point in the history
  • Loading branch information
killcerr authored Jul 20, 2024
2 parents 9fa8b05 + 266b847 commit dab4a55
Show file tree
Hide file tree
Showing 13 changed files with 359 additions and 388 deletions.
8 changes: 4 additions & 4 deletions src/mc/events/MinecraftEventing.h
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,10 @@ class MinecraftEventing {
// ?fireEventFeedbackSubmitted@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N1@Z
MCVAPI void fireEventFeedbackSubmitted(std::string const& productId, bool safetyCheckSuccessful, bool isValidText);

// symbol:
// ?fireEventGameRulesUpdated@MinecraftEventing@@UEAAX_N0AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
MCVAPI void fireEventGameRulesUpdated(bool oldValue, bool newValue, std::string const& gameRuleName);

// symbol:
// ?fireEventGameRulesUpdated@MinecraftEventing@@UEAAXMMAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
MCVAPI void fireEventGameRulesUpdated(float oldValue, float newValue, std::string const& gameRuleName);
Expand All @@ -684,10 +688,6 @@ class MinecraftEventing {
// ?fireEventGameRulesUpdated@MinecraftEventing@@UEAAXHHAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
MCVAPI void fireEventGameRulesUpdated(int oldValue, int newValue, std::string const& gameRuleName);

// symbol:
// ?fireEventGameRulesUpdated@MinecraftEventing@@UEAAX_N0AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
MCVAPI void fireEventGameRulesUpdated(bool oldValue, bool newValue, std::string const& gameRuleName);

// symbol: ?fireEventGameTip@MinecraftEventing@@UEAAXHHHW4InputMode@@@Z
MCVAPI void fireEventGameTip(int, int, int, ::InputMode);

Expand Down
14 changes: 7 additions & 7 deletions src/mc/network/AutomationClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@ class AutomationClient {
// symbol: ?playerListChanged@AutomationClient@Automation@@UEAAXXZ
MCVAPI void playerListChanged();

// symbol: ?send@AutomationClient@Automation@@UEAAXAEBUChatMessage@CodeBuilder@@@Z
MCVAPI void send(struct CodeBuilder::ChatMessage const& message);
// symbol: ?send@AutomationClient@Automation@@UEAAXAEBUCommandMessage@CodeBuilder@@@Z
MCVAPI void send(struct CodeBuilder::CommandMessage const& message);

// symbol: ?send@AutomationClient@Automation@@UEAAXAEBUErrorMessage@CodeBuilder@@@Z
MCVAPI void send(struct CodeBuilder::ErrorMessage const& message);

// symbol: ?send@AutomationClient@Automation@@UEAAXAEBUCommandMessage@CodeBuilder@@@Z
MCVAPI void send(struct CodeBuilder::CommandMessage const& message);

// symbol: ?send@AutomationClient@Automation@@UEAAXAEBUEventMessage@CodeBuilder@@@Z
MCVAPI void send(struct CodeBuilder::EventMessage const& message);
// symbol: ?send@AutomationClient@Automation@@UEAAXAEBUChatMessage@CodeBuilder@@@Z
MCVAPI void send(struct CodeBuilder::ChatMessage const& message);

// symbol: ?send@AutomationClient@Automation@@UEAAXAEBUAgentMessage@CodeBuilder@@@Z
MCVAPI void send(struct CodeBuilder::AgentMessage const& message);

// symbol: ?send@AutomationClient@Automation@@UEAAXAEBUEventMessage@CodeBuilder@@@Z
MCVAPI void send(struct CodeBuilder::EventMessage const& message);

// symbol: ?tick@AutomationClient@Automation@@UEAAXXZ
MCVAPI void tick();

Expand Down
235 changes: 119 additions & 116 deletions src/mc/network/NetEventCallback.h

Large diffs are not rendered by default.

144 changes: 72 additions & 72 deletions src/mc/network/ServerNetworkHandler.h

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions src/mc/network/packet/ClientboundCloseFormPacket.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#pragma once

#include "mc/_HeaderOutputPredefine.h"

// auto generated inclusion list
#include "mc/deps/core/common/bedrock/Result.h"
#include "mc/enums/MinecraftPacketIds.h"
#include "mc/network/packet/Packet.h"

class ClientboundCloseFormPacket : public ::Packet {
public:
// prevent constructor by default
ClientboundCloseFormPacket& operator=(ClientboundCloseFormPacket const&);
ClientboundCloseFormPacket(ClientboundCloseFormPacket const&);
ClientboundCloseFormPacket();

public:
// NOLINTBEGIN
// vIndex: 0, symbol: ??1ClientboundCloseFormPacket@@UEAA@XZ
virtual ~ClientboundCloseFormPacket();

// vIndex: 1, symbol: ?getId@ClientboundCloseFormPacket@@UEBA?AW4MinecraftPacketIds@@XZ
virtual ::MinecraftPacketIds getId() const;

// vIndex: 2, symbol:
// ?getName@ClientboundCloseFormPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
virtual std::string getName() const;

// vIndex: 4, symbol: ?write@ClientboundCloseFormPacket@@UEBAXAEAVBinaryStream@@@Z
virtual void write(class BinaryStream&) const;

// vIndex: 8, symbol:
// ?_read@ClientboundCloseFormPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z
virtual class Bedrock::Result<void> _read(class ReadOnlyBinaryStream&);

// NOLINTEND
};
28 changes: 0 additions & 28 deletions src/mc/network/packet/UpdateSubChunkBlocksChangedInfo.h
Original file line number Diff line number Diff line change
@@ -1,28 +0,0 @@
#pragma once

#include "mc/_HeaderOutputPredefine.h"
#include "mc/network/packet/UpdateSubChunkNetworkBlockInfo.h"

struct UpdateSubChunkBlocksChangedInfo {
public:
std::vector<UpdateSubChunkNetworkBlockInfo> mStandards; // this+0x0
std::vector<UpdateSubChunkNetworkBlockInfo> mExtras; // this+0x18

public:
// prevent constructor by default
UpdateSubChunkBlocksChangedInfo& operator=(UpdateSubChunkBlocksChangedInfo const&);
UpdateSubChunkBlocksChangedInfo(UpdateSubChunkBlocksChangedInfo const&);

public:
// NOLINTBEGIN
// symbol: ??0UpdateSubChunkBlocksChangedInfo@@QEAA@XZ
MCAPI UpdateSubChunkBlocksChangedInfo();

// symbol: ?add@UpdateSubChunkBlocksChangedInfo@@QEAAXAEBVBlockPos@@IAEBVBlock@@HPEBUActorBlockSyncMessage@@@Z
MCAPI void add(class BlockPos const&, uint, class Block const&, int, struct ActorBlockSyncMessage const*);

// symbol: ??1UpdateSubChunkBlocksChangedInfo@@QEAA@XZ
MCAPI ~UpdateSubChunkBlocksChangedInfo();

// NOLINTEND
};
26 changes: 0 additions & 26 deletions src/mc/network/packet/UpdateSubChunkNetworkBlockInfo.h
Original file line number Diff line number Diff line change
@@ -1,26 +0,0 @@
#pragma once

#include "mc/_HeaderOutputPredefine.h"
#include "mc/network/NetworkBlockPosition.h"
#include "mc/world/level/ActorBlockSyncMessage.h"

struct UpdateSubChunkNetworkBlockInfo {
public:
NetworkBlockPosition mPos; // this+0x0
uint mRuntimeId; // this+0xC
uchar mUpdateFlags; // this+0x10
ActorBlockSyncMessage mSyncMessage; // this+0x18

public:
// prevent constructor by default
UpdateSubChunkNetworkBlockInfo& operator=(UpdateSubChunkNetworkBlockInfo const&);
UpdateSubChunkNetworkBlockInfo(UpdateSubChunkNetworkBlockInfo const&);
UpdateSubChunkNetworkBlockInfo();

public:
// NOLINTBEGIN
// symbol: ??1UpdateSubChunkNetworkBlockInfo@@QEAA@XZ
MCAPI ~UpdateSubChunkNetworkBlockInfo();

// NOLINTEND
};
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ namespace ScriptModuleMinecraftServerUI { class ScriptMessageFormData; }
namespace ScriptModuleMinecraftServerUI { class ScriptMessageFormResponse; }
namespace ScriptModuleMinecraftServerUI { class ScriptModalFormData; }
namespace ScriptModuleMinecraftServerUI { class ScriptModalFormResponse; }
namespace ScriptModuleMinecraftServerUI { class ScriptUIManager; }
namespace Scripting { class DependencyLocator; }
namespace Scripting { class ScriptObjectFactory; }
namespace Scripting { struct ContextConfig; }
Expand Down
45 changes: 45 additions & 0 deletions src/mc/scripting/modules/minecraft_ui/ScriptUIManager.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#pragma once

#include "mc/_HeaderOutputPredefine.h"

// auto generated inclusion list
#include "mc/external/scripting/ClassBindingBuilder.h"
#include "mc/external/scripting/Result.h"

// auto generated forward declare list
// clang-format off
namespace ScriptModuleMinecraft { class ScriptPlayer; }
// clang-format on

namespace ScriptModuleMinecraftServerUI {

class ScriptUIManager {
public:
// prevent constructor by default
ScriptUIManager& operator=(ScriptUIManager const&);
ScriptUIManager(ScriptUIManager const&);

public:
// NOLINTBEGIN
// symbol: ??0ScriptUIManager@ScriptModuleMinecraftServerUI@@QEAA@XZ
MCAPI ScriptUIManager();

// symbol:
// ?closeAllForms@ScriptUIManager@ScriptModuleMinecraftServerUI@@QEAA?AV?$Result@X$$V@Scripting@@AEAVScriptPlayer@ScriptModuleMinecraft@@@Z
MCAPI class Scripting::Result<void> closeAllForms(class ScriptModuleMinecraft::ScriptPlayer&);

// symbol: ??4ScriptUIManager@ScriptModuleMinecraftServerUI@@QEAAAEAV01@$$QEAV01@@Z
MCAPI class ScriptModuleMinecraftServerUI::ScriptUIManager&
operator=(class ScriptModuleMinecraftServerUI::ScriptUIManager&&);

// symbol: ??1ScriptUIManager@ScriptModuleMinecraftServerUI@@QEAA@XZ
MCAPI ~ScriptUIManager();

// symbol:
// ?bind@ScriptUIManager@ScriptModuleMinecraftServerUI@@SA?AV?$ClassBindingBuilder@VScriptUIManager@ScriptModuleMinecraftServerUI@@@Scripting@@XZ
MCAPI static class Scripting::ClassBindingBuilder<class ScriptModuleMinecraftServerUI::ScriptUIManager> bind();

// NOLINTEND
};

}; // namespace ScriptModuleMinecraftServerUI
6 changes: 3 additions & 3 deletions src/mc/server/ServerLevel.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ class ServerLevel : public ::Level {
// symbol: ?getLevelChunkMetaDataManager@ServerLevel@@UEAAPEAVLevelChunkMetaDataManager@@XZ
MCVAPI class LevelChunkMetaDataManager* getLevelChunkMetaDataManager();

// symbol: ?getPlayerSleepManager@ServerLevel@@UEAAAEAVPlayerSleepManager@@XZ
MCVAPI class PlayerSleepManager& getPlayerSleepManager();

// symbol: ?getPlayerSleepManager@ServerLevel@@UEBAAEBVPlayerSleepManager@@XZ
MCVAPI class PlayerSleepManager const& getPlayerSleepManager() const;

// symbol: ?getPlayerSleepManager@ServerLevel@@UEAAAEAVPlayerSleepManager@@XZ
MCVAPI class PlayerSleepManager& getPlayerSleepManager();

// symbol: ?getPositionTrackerDBServer@ServerLevel@@UEBAPEAVPositionTrackingDBServer@PositionTrackingDB@@XZ
MCVAPI class PositionTrackingDB::PositionTrackingDBServer* getPositionTrackerDBServer() const;

Expand Down
Loading

0 comments on commit dab4a55

Please sign in to comment.