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

6
Minecraft.World/Recipes.h
View File

@@ -31,6 +31,7 @@ class StructureRecipies;
class ToolRecipies;
class WeaponRecipies;
class ShapedRecipy;
class FireworksRecipe;
typedef unordered_map<wchar_t, ItemInstance *> myMap;
@@ -89,7 +90,7 @@ public:
ShapedRecipy *addShapedRecipy(ItemInstance *, ... );
void addShapelessRecipy(ItemInstance *result,... );
shared_ptr<ItemInstance> getItemFor(shared_ptr<CraftingContainer> craftSlots, Level *level);
shared_ptr<ItemInstance> getItemFor(shared_ptr<CraftingContainer> craftSlots, Level *level, Recipy *recipesClass = NULL); // 4J Added recipesClass param
vector <Recipy *> *getRecipies();
// 4J-PB - Added all below for new Xbox 'crafting'
@@ -100,7 +101,7 @@ private:
void buildRecipeIngredientsArray();
Recipy::INGREDIENTS_REQUIRED *m_pRecipeIngredientsRequired;
public:
static ToolRecipies *pToolRecipies;
static WeaponRecipies *pWeaponRecipies;
static StructureRecipies *pStructureRecipies;
@@ -108,4 +109,5 @@ private:
static FoodRecipies *pFoodRecipies;
static ClothDyeRecipes *pClothDyeRecipes;
static ArmorRecipes *pArmorRecipes;
static FireworksRecipe *pFireworksRecipes;
};