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

34
Minecraft.World/OreRecipies.cpp
View File

@@ -1,10 +1,3 @@
// package net.minecraft.world.item.crafting;
//
// import net.minecraft.world.item.DyePowderItem;
// import net.minecraft.world.item.Item;
// import net.minecraft.world.item.ItemInstance;
// import net.minecraft.world.level.tile.Tile;
#include "stdafx.h"
#include "net.minecraft.world.item.h"
#include "DyePowderItem.h"
@@ -13,25 +6,8 @@
#include "Recipes.h"
#include "OreRecipies.h"
/*
private Object[][] map = {
{
Tile.goldBlock, new ItemInstance(Item.goldIngot, 9)
}, {
Tile.ironBlock, new ItemInstance(Item.ironIngot, 9)
}, {
Tile.diamondBlock, new ItemInstance(Item.diamond, 9)
}, {
Tile.lapisBlock, new ItemInstance(Item.dye_powder, 9, DyePowderItem.BLUE)
},
};
*/
void OreRecipies::_init()
{
map = new vector <Object *> [MAX_ORE_RECIPES];
ADD_OBJECT(map[0],Tile::goldBlock);
ADD_OBJECT(map[0],new ItemInstance(Item::goldIngot, 9));
@@ -46,10 +22,18 @@ void OreRecipies::_init()
ADD_OBJECT(map[4],Tile::lapisBlock);
ADD_OBJECT(map[4],new ItemInstance(Item::dye_powder, 9, DyePowderItem::BLUE));
ADD_OBJECT(map[5],Tile::redstoneBlock);
ADD_OBJECT(map[5],new ItemInstance(Item::redStone, 9));
ADD_OBJECT(map[6],Tile::coalBlock);
ADD_OBJECT(map[6],new ItemInstance(Item::coal, 9, CoalItem::STONE_COAL));
ADD_OBJECT(map[7],Tile::hayBlock);
ADD_OBJECT(map[7],new ItemInstance(Item::wheat, 9));
}
void OreRecipies::addRecipes(Recipes *r)
{
for (int i = 0; i < MAX_ORE_RECIPES; i++)
{
Tile *from = (Tile*) map[i].at(0)->tile;