feat: TU19 (Dec 2014) Features & Content (#155)
* 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
@@ -1,105 +1,125 @@
|
||||
#include "stdafx.h"
|
||||
#include "net.minecraft.world.Item.h"
|
||||
#include "DyePowderItem.h"
|
||||
#include "Tile.h"
|
||||
#include "ClothTile.h"
|
||||
#include "net.minecraft.world.level.tile.h"
|
||||
#include "Recipy.h"
|
||||
#include "Recipes.h"
|
||||
#include "ClothDyeRecipes.h"
|
||||
|
||||
void ClothDyeRecipes::addRecipes(Recipes *r)
|
||||
{
|
||||
// recipes for converting cloth to colored cloth using dye
|
||||
for (int i = 0; i < 16; i++)
|
||||
// recipes for converting cloth to colored cloth using dye
|
||||
for (int i = 0; i < 16; i++)
|
||||
{
|
||||
r->addShapelessRecipy(new ItemInstance(Tile::cloth, 1, ClothTile::getItemAuxValueForTileData(i)), //
|
||||
r->addShapelessRecipy(new ItemInstance(Tile::wool, 1, ColoredTile::getItemAuxValueForTileData(i)), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, i), new ItemInstance(Item::items[Tile::cloth_Id], 1, 0),L'D');
|
||||
}
|
||||
new ItemInstance(Item::dye_powder, 1, i), new ItemInstance(Item::items[Tile::wool_Id], 1, 0),L'D');
|
||||
r->addShapedRecipy(new ItemInstance(Tile::clayHardened_colored, 8, ColoredTile::getItemAuxValueForTileData(i)), //
|
||||
L"sssczczg",
|
||||
L"###",
|
||||
L"#X#",
|
||||
L"###",
|
||||
L'#', new ItemInstance(Tile::clayHardened),
|
||||
L'X', new ItemInstance(Item::dye_powder, 1, i),L'D');
|
||||
|
||||
// some dye recipes
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW),
|
||||
#if 0
|
||||
r->addShapedRecipy(new ItemInstance(Tile::stained_glass, 8, ColoredTile::getItemAuxValueForTileData(i)), //
|
||||
L"sssczczg",
|
||||
L"###",
|
||||
L"#X#",
|
||||
L"###",
|
||||
L'#', new ItemInstance(Tile::glass),
|
||||
L'X', new ItemInstance(Item::dye_powder, 1, i), L'D');
|
||||
r->addShapedRecipy(new ItemInstance(Tile::stained_glass_pane, 16, i), //
|
||||
L"ssczg",
|
||||
L"###",
|
||||
L"###",
|
||||
L'#', new ItemInstance(Tile::stained_glass, 1, i), L'D');
|
||||
#endif
|
||||
}
|
||||
|
||||
// some dye recipes
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW),
|
||||
L"tg",
|
||||
Tile::flower,L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::RED),
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::RED),
|
||||
L"tg",
|
||||
Tile::rose,L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::WHITE),
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::WHITE),
|
||||
L"ig",
|
||||
Item::bone,L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PINK), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PINK), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::ORANGE), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::ORANGE), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIME), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIME), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::GRAY), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::GRAY), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::SILVER), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::SILVER), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::GRAY),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::GRAY),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::SILVER), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::SILVER), //
|
||||
L"zzzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIGHT_BLUE), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIGHT_BLUE), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::CYAN), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::CYAN), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PURPLE), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PURPLE), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::PURPLE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::PURPLE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::MAGENTA), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::MAGENTA), //
|
||||
L"zzzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 4, DyePowderItem::MAGENTA), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 4, DyePowderItem::MAGENTA), //
|
||||
L"zzzzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
for (int i = 0; i < 16; i++)
|
||||
{
|
||||
r->addShapedRecipy(new ItemInstance(Tile::woolCarpet, 3, i),
|
||||
L"sczg",
|
||||
L"##",
|
||||
L'#', new ItemInstance(Tile::cloth, 1, i),
|
||||
L'#', new ItemInstance(Tile::wool, 1, i),
|
||||
L'D'
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user