backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-07-13 18:27:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into upstream-merge

Browse source
This commit is contained in:
/home/neo 2026-04-15 12:10:41 +03:00 committed by GitHub
parent 8d72625516 a252e60b93
commit 219d871c54
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/PlayerList.cpp
View file

@ -215,7 +215,7 @@ bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
int centreZC = 0;
#endif
// 4J Added - Give every player a map the first time they join a server
player->inventory->setItem( 9, std::make_shared<ItemInstance>(Item::map_Id, 1, level->getAuxValueForMap(player->getXuid(), 0, centreXC, centreZC, mapScale)));
player->inventory->setItem( 9, std::make_shared<ItemInstance>(Item::emptyMap_Id, 1, level->getAuxValueForMap(player->getXuid(), 0, centreXC, centreZC, mapScale)));
if(app.getGameRuleDefinitions() != nullptr)
{
app.getGameRuleDefinitions()->postProcessPlayer(player);

4
Minecraft.World/Item.cpp
View file

@ -484,7 +484,9 @@ void Item::staticCtor()
// TU14
//Item::writingBook = (new WritingBookItem(130))->setIcon(11, 11)->setDescriptionId("writingBook");
//Item::writtenBook = (new WrittenBookItem(131))->setIcon(12, 11)->setDescriptionId("writtenBook");
Item::writingBook = (new WritingBookItem(130))->setIconName(L"writingBook")->setDescriptionId(IDS_ITEM_WRITINGBOOK)->setUseDescriptionId(IDS_DESC_WRITINGBOOK)->setMaxStackSize(1);
//Item::book = ( new BookItem(84) ) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_book)->setIconName(L"book")->setDescriptionId(IDS_ITEM_BOOK)->setUseDescriptionId(IDS_DESC_BOOK);
//->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_book)
Item::writingBook = (new WritingBookItem(130))->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_book)->setIconName(L"writingBook")->setDescriptionId(IDS_ITEM_WRITINGBOOK)->setUseDescriptionId(IDS_DESC_WRITINGBOOK)->setMaxStackSize(1);
Item::writtenBook = (new WrittenBookItem(131))->setIconName(L"writtenBook")->setDescriptionId(IDS_ITEM_WRITTENBOOK)->setUseDescriptionId(IDS_DESC_WRITTENBOOK)->setMaxStackSize(1);
Item::emerald = (new Item(132)) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_emerald)->setIconName(L"emerald")->setDescriptionId(IDS_ITEM_EMERALD)->setUseDescriptionId(IDS_DESC_EMERALD);

54
Minecraft.World/Recipes.cpp
View file

@ -145,52 +145,58 @@ Recipes::Recipes()
L'#', Item::stick,
L'S');
addShapedRecipy(new ItemInstance(Tile::fence, 2), //
addShapedRecipy(new ItemInstance(Tile::fence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, 0),
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, TreeTile::OAK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::fence, 2), //
addShapedRecipy(new ItemInstance(Tile::birchFence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK),
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::spruceFence, 2), //
addShapedRecipy(new ItemInstance(Tile::spruceFence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::SPRUCE_TRUNK),
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::jungleFence, 2), //
addShapedRecipy(new ItemInstance(Tile::jungleFence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK),
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::acaciaFence, 2), //
addShapedRecipy(new ItemInstance(Tile::acaciaFence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::ACACIA_TRUNK),
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, TreeTile::ACACIA_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::darkFence, 2), //
addShapedRecipy(new ItemInstance(Tile::darkFence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK),
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::cobbleWall, 6, WallTile::TYPE_NORMAL), //
@ -225,52 +231,52 @@ Recipes::Recipes()
L'#', Item::ironIngot,
L'S');
addShapedRecipy(new ItemInstance(Tile::fenceGate, 2), //
addShapedRecipy(new ItemInstance(Tile::fenceGate, 1), //
L"ssciczg",
L"#W#", //
L"#W#", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, 0),
L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, 0),
L'S');
addShapedRecipy(new ItemInstance(Tile::birchGate, 2), //
addShapedRecipy(new ItemInstance(Tile::birchGate, 1), //
L"ssciczg",
L"#W#", //
L"#W#", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK),
L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::spruceGate, 2), //
addShapedRecipy(new ItemInstance(Tile::spruceGate, 1), //
L"ssciczg",
L"#W#", //
L"#W#", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::SPRUCE_TRUNK),
L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::SPRUCE_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::jungleGate, 2), //
addShapedRecipy(new ItemInstance(Tile::jungleGate, 1), //
L"ssciczg",
L"#W#", //
L"#W#", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK),
L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::acaciaGate, 2), //
addShapedRecipy(new ItemInstance(Tile::acaciaGate, 1), //
L"ssciczg",
L"#W#", //
L"#W#", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::ACACIA_TRUNK),
L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::ACACIA_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::darkGate, 2), //
addShapedRecipy(new ItemInstance(Tile::darkGate, 1), //
L"ssciczg",
L"#W#", //
L"#W#", //
L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK),
L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Item::door_wood, 3), //

1
Minecraft.World/TreeTile.h
View file

@ -10,6 +10,7 @@ class TreeTile : public RotatedPillarTile
friend class Tile;
friend class ChunkRebuildData;
public:
static const int OAK_TRUNK = 0;
static const int SPRUCE_TRUNK = 1; // this needs to be changed to spruce...
static const int BIRCH_TRUNK = 2;
static const int JUNGLE_TRUNK = 3;