Skip to content

Feat: creative other tab (closes #132) #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Majonezowy wants to merge 1 commit into from
+43 −0
Closed

Feat: creative other tab (closes #132) #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,42 @@ void IUIScene_CreativeMenu::staticCtor()
{
vector< shared_ptr<ItemInstance> > *list;

// Other items
DEF(eCreativeInventory_Other)
ITEM(Tile::unbreakable_Id) // Bedrock

ITEM(Tile::water_Id)
ITEM(Tile::calmWater_Id)
ITEM(Tile::lava_Id)
ITEM(Tile::calmLava_Id)

ITEM(Tile::pistonExtensionPiece_Id)
ITEM(Tile::pistonMovingPiece_Id)

ITEM(Tile::fire_Id)
ITEM(Tile::mobSpawner_Id)

ITEM(Tile::furnace_lit_Id)
ITEM(Tile::wallSign_Id)

ITEM(Tile::redStoneOre_lit_Id)
ITEM(Tile::redstoneTorch_off_Id)

ITEM(Tile::portalTile_Id)
ITEM(Tile::endPortalTile_Id)

ITEM(Tile::diode_on_Id)
ITEM(Tile::comparator_on_Id)

ITEM(Tile::tripWire_Id)

ITEM(Tile::pumpkinStem_Id)
ITEM(Tile::melonStem_Id)
ITEM(Tile::netherStalk_Id)
ITEM(Tile::cocoa_Id)

ITEM(Tile::dragonEgg_Id)
ITEM(Tile::commandBlock_Id)

// Building Blocks
DEF(eCreativeInventory_BuildingBlocks)
Expand Down Expand Up @@ -748,6 +784,11 @@ void IUIScene_CreativeMenu::staticCtor()
ECreative_Inventory_Groups miscGroup[] = {eCreativeInventory_Misc};
specs[eCreativeInventoryTab_Misc] = new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup);
#endif

ECreative_Inventory_Groups otherGroup[] = { eCreativeInventory_Other };

specs[eCreativeInventoryTab_Other] =
new TabSpec(L"Other", IDS_GROUPNAME_MISCELLANEOUS, 1, otherGroup);
}

IUIScene_CreativeMenu::IUIScene_CreativeMenu()
Expand Down
2 changes: 2 additions & 0 deletions Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class IUIScene_CreativeMenu : public virtual IUIScene_AbstractContainerMenu
eCreativeInventoryTab_ToolsWeaponsArmor,
eCreativeInventoryTab_Brewing,
eCreativeInventoryTab_Misc,
eCreativeInventoryTab_Other,
eCreativeInventoryTab_COUNT,
};

Expand All @@ -40,6 +41,7 @@ class IUIScene_CreativeMenu : public virtual IUIScene_AbstractContainerMenu
eCreativeInventory_Misc,
eCreativeInventory_ArtToolsDecorations,
eCreativeInventory_ArtToolsMisc,
eCreativeInventory_Other,
eCreativeInventoryGroupsCount
};

Expand Down