Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Minecraft.World/ClientSideMerchant.h
View File

@@ -10,21 +10,21 @@ class ClientSideMerchant : public Merchant, public enable_shared_from_this<Clien
{
private:
MerchantContainer *container;
shared_ptr<Player> source;
MerchantRecipeList *currentOffers;
int m_name;
shared_ptr<Player> source;
MerchantRecipeList *currentOffers;
wstring m_name;
public:
ClientSideMerchant(shared_ptr<Player> source, int name);
ClientSideMerchant(shared_ptr<Player> source, const wstring &name);
~ClientSideMerchant();
void createContainer(); // 4J Added
Container *getContainer();
shared_ptr<Player> getTradingPlayer();
void setTradingPlayer(shared_ptr<Player> player);
MerchantRecipeList *getOffers(shared_ptr<Player> forPlayer);
void overrideOffers(MerchantRecipeList *recipeList);
void notifyTrade(MerchantRecipe *activeRecipe);
Container *getContainer();
shared_ptr<Player> getTradingPlayer();
void setTradingPlayer(shared_ptr<Player> player);
MerchantRecipeList *getOffers(shared_ptr<Player> forPlayer);
void overrideOffers(MerchantRecipeList *recipeList);
void notifyTrade(MerchantRecipe *activeRecipe);
void notifyTradeUpdated(shared_ptr<ItemInstance> item);
int getDisplayName();
wstring getDisplayName();
};