summaryrefslogtreecommitdiffstats
path: root/src/UI/SlotArea.cpp (unfollow)
Commit message (Collapse)AuthorFilesLines
2020-07-14Introduce recipe book functionality (#4493)Tobias Wilken1-5/+65
* Introduce recipe book functionality The recipe book helps especially new players. Missing it gives the impression that cuberite is not as advanced as it is. The handling of the recipe book uses the following functions: - Unlock Recipes (https://wiki.vg/index.php?title=Protocol&oldid=14204#Unlock_Recipes) to make recipes available and show the notification for new recipes. Initialization is done on player login for known ones, the update is done when new items are discovered. - Craft Recipe Request (https://wiki.vg/index.php?title=Protocol&oldid=14204#Craft_Recipe_Request) when the user selects a recipe from the recipe book to fill the slots. Known recipes are initialized on player login via `Unlock Recipes` with `Action` 0. As soon as a new recipe is discovered this is added via `Unlock Recipes` with `Action` 1. To be able to know and recognize new recipes the player class is extended with `KnownItems` and `KnownRecipes`. As soon as a player touches an item this is compared to the list of `KnownItems`, if the item is unknown the recipes are checked for this item and the other ingredients are checked with the list of `KnownItems`. If a full match is discovered the recipe is unlocked with the client and stored in the `KnownRecipes`. To unlock recipes the recipe ID is sent to the client. A mapping file (for protocol 1.12.2) translated the minecraft recipe names to ids. The crafting.txt is extended with and minecraft recipe names is possible. Limitations: Only a single recipe is added to the crafting area. Multiple clicks or shift click does not increase the number of builds. Co-authored-by: peterbell10 <peterbell10@live.co.uk> * Address first issues mentioned by @peterbell10 - Some linting - Extract loading of recipe specific protocol mapping into a function - Build `RecipeNameMap` only once - Use `std::optional` - Extract `LoadRecipe` from `Window` * Start to implement new suggestions * Update with suggestions from @peterbell10 * Some minor cleanup * Update protocol packet IDs * Remove unused include * Include header in cmake * Change a vector to integer counter * Change dromedaryCase method names to PascalCase * Address suggestions from @madmaxoft * Read Protocol subdirectories to load recipe books To load all recipebooks iterate over the `Protocol` subdirectories to find mapping files. Co-authored-by: peterbell10 <peterbell10@live.co.uk>
2020-07-04cWindow: Convert XYZ to Vector3 (#4764)MaxwellScroggs1-11/+7
2020-05-15Enable some more clang-tidy linter checks (#4738)peterbell101-1/+0
* Avoid inefficient AString -> c_str() -> AString round trip * Avoid redundant string init expressions * Avoid unnecessary return, continue, etc. * Add .clang-format to help with clang-tidy fix-its * Avoid unnecessary passing by value * Avoid unnecessary local copying * Avoid copying in range-for loops * Avoid over-complicated boolean expressions * Some violations missed by my local clang-tidy * Allow unnecessary continue statements * Add brackets * Another expression missed locally * Move BindingsProcessor call into clang-tidy.sh and add space * Fix pushd not found error * Different grouping of CheckBlockInteractionRate
2020-05-04Improve entity position updates (#4701)Tiger Wang1-4/+1
* Make puking pickups fly nicer * Improve entity position updates * Move determination of whether a delta is too big for a packet into the protocol handlers + Less jittery movement + Generalise CollectEntity to take any entity
2020-04-16Using Super.Mattes D1-16/+16
2020-03-28Toss all items from enchantment table (#4569)Mat1-2/+2
2018-08-29Force all headers other than "Globals.h" to be included with relative paths (#4269)peterbell101-1/+1
Closes #4236 CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/". #include "Globals.h" still works by including the build generated file and any other src-relative path will not work.
2018-08-17Handle the lapis slot separately (#4286)Nate1-0/+36
This is my attempt to fix #4112. The root cause of the issue was that the lapis slot was treated exactly the same as the enchanting slot, so it on the server side it would only ever slot one item. My fix is to check if its the second slot in the window, then check if it's lapis (it would slot whatever). If it is lapis I call the base click handler.
2018-08-02Experience orb (#4259)changyong guo1-1/+1
* Replace cWorld::FindClosesPlayer with cWorld::DoWithClosestPlayer * Implement experience reward splitting into the orb sizes used in vanilla * Modified speed calculation in cExpOrb::Tick to make the orbs fly towards the player Fixes #4216
2018-07-27cWorld: Manually bind deprecated broadcast functions (#4265)peterbell101-3/+4
Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193
2018-07-26CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell101-1/+6
Add check for number of empty lines between functions and fix the corresponding failures
2018-05-02Prefer static_cast to reinterpret_cast (#4223)peterbell101-3/+3
* Change reinterpret_cast -> static_cast wherever possible * Remove more unnecessary `const_cast`s. reinterpret_casts should be avoided for the same reason as c-style casts - they don't do any type-checking. reinterpret_cast was mainly being used for down-casting in inheritance hierarchies but static_cast works just as well while also making sure that there is actually an inheritance relationship there.
2018-04-11Smelting Gives Experience (#4094)Alex Sweet1-1/+6
* Smelting Exp Smelting now gives experience * Furnace.txt update Exp rewards are entered in furnace.txt, Reward calculation is now done is the furnaceentity class * furnace.txt update Changed alignment tabs to spaces Included documentation of exp in recipe * Updated StringToFloat changed strtod to strtof * Explicit Float to Int * Reworked Smelting Rewards * No C casts -Adds new function to the api -Sets reward counter to 0 in furnace constructor * Style and exp lock removed -Fixed style mistakes accoring to PR notes -XP isn't locked to a single player anymore * No Smelter API -Removed SetLastSmelter and GetLastSmelter -Fixed comments -Fixed log reward amounts
2017-10-21Implement horse inventory (#4053)peterbell101-0/+119
* Implement horse inventory * Fix sign conversions * Add API doc for ItemCategory::IsHorseArmor * Improve HandleOpenHorseInventory comment and style fixes.
2017-09-14Fix switch warnings (#4013)peterbell101-2/+5
* Fix switch warnings * Fix a variety of -Wswitch and -Wswitch-enum warnings * Remove unneeded -Wno-error flags * Reorganise some eMonsterType switches * Alpha sort eMonsterType cases in WriteMobMetadata and in cNBTChunkSerializer::AddMonsterEntity * List all mob types in protocol 1.12 and NBTChunkSerializer * cStructGenTrees::GetNumTrees: remove switch default * cWSSAnvil::LoadOldMinecartFromNBT: Log unhandled minecart type
2017-08-02Removed double includes (#3885)Lukas Pioch1-1/+0
2017-07-28Added anvil enchantment handling. (#3857)Lane Kolbly1-4/+5
+ Added anvil enchantment handling.
2017-06-13FastRandom rewrite (#3754)peterbell101-4/+3
2017-05-08Corrected brewingstand and added support for fuelLukas Pioch1-71/+76
2017-02-05Fixed bindings for cBlockArea:Read and Write. (#3568)Mattes D1-2/+2
The original bindings accepted nil as the World param, causing a crash.
2016-11-18Removed ClientHandle.h dependencies from common headers.Mattes D1-0/+1
2016-10-12Spectators added (#2852)bibo381-0/+8
2016-02-05Bulk clearing of whitespaceLogicParrot1-28/+28
2015-12-17Moved variables into scope, removed unused variables and fixed variablesLukas Pioch1-2/+1
2015-11-24Add enum for Sound and Particle EffectsDave Tucker1-3/+4
Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
2015-11-03Implemented brewingLukas Pioch1-0/+238
2015-07-29Silenced and fixed many warning messages across multiple files.Samuel Barney1-28/+28
2015-05-24Fixes #2041Tiger Wang1-3/+3
2015-05-18Fixes #2003Tiger Wang1-1/+1
2014-12-13Implemented vanilla-like shift click.Howaner1-55/+68
This fixes many visual bugs.
2014-12-13Own classes for all windows.Howaner1-3/+4
2014-12-05Fixed reported parentheses around comparisons.Mattes D1-1/+1
2014-10-23En masse NULL -> nullptr replaceTiger Wang1-20/+20
2014-10-21Replace &*[0] accesses with .data()Tiger Wang1-2/+2
2014-10-20En masse NULL -> nullptr replaceTiger Wang1-20/+20
2014-10-15Functions in cPluginManager get references instead of pointers.Mattes D1-2/+2
2014-09-13Implemented Chest MinecartsTiger Wang1-0/+35
2014-08-28Added comments.Hownaer1-1/+3
2014-08-28Fixed crashes and use std::swap.Hownaer1-6/+3
2014-08-28Enchanting table improvements.Hownaer1-115/+77
2014-07-30Added beacon.Howaner1-0/+195
2014-07-26Change comment.Howaner1-1/+1
2014-07-20Add armor items directly to the armor slots.Howaner1-2/+2
2014-07-18Moved comment.Howaner1-1/+1
2014-07-18Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary.Howaner1-0/+13
2014-07-17Basic style fixes.madmaxoft1-3/+3
2014-07-17Normalized comments.madmaxoft1-16/+16
This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-09Removed unused include line.Howaner1-1/+0
2014-07-09Added inventory number click.Howaner1-0/+38
2014-07-06Fixed crafting grid updating.Mattes D1-2/+20
Fixes #1152.
2014-07-06Added drop window action.Howaner1-10/+100
2014-07-05Add middle click.Howaner1-19/+83
2014-06-29Removed bad commentTiger Wang1-1/+0
2014-06-29Properly implemented enderchestsTiger Wang1-2/+2
2014-06-04derpworktycho1-1/+1
2014-06-04Make sure m_StackSizeToBeUsedInRepair Always has a valid valueworktycho1-1/+3
2014-06-01Players can't set items in the result slot, when they shift a item.Howaner1-0/+38
2014-06-01Add HandleSmeltItem() call for achievements.Howaner1-7/+11
2014-06-01Missing return;Howaner1-0/+1
2014-05-31Set DraggingItem to Slot directly.Howaner1-1/+1
2014-05-31Fix DBL bug.Howaner1-5/+4
2014-05-31Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0"Howaner1-1/+1
2014-05-30Fix the furnace result slot.Howaner1-2/+90
2014-05-19Fixed some warnings in Server.cpp, and in UI/Julian Laubstein1-1/+2
2014-05-16Fixed anvil exp removingtonibm191-1/+1
2014-05-12cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew1-1/+41
2014-05-09Fixed MSVC 64-bit build warnings.Mattes D1-1/+1
2014-05-08Fixed MSVC 64-bit build warnings.Mattes D1-1/+1
2014-05-07Change m_RepairCost to int.Howaner1-9/+3
2014-05-07Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner1-24/+36
2014-05-06Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count()Howaner1-6/+5
2014-05-05Fix SetRepairedItemName() in SlotArea.cppHowaner1-1/+1
2014-05-05Add comments to CanTakeResultItem()Howaner1-5/+5
2014-05-05Add anvil shift click.Howaner1-4/+83
2014-05-05Add clicks, exp subtraction, item check, ...Howaner1-9/+155
2014-05-05Add MC|ItemName plugin message.Howaner1-5/+5
2014-05-05Add anvil window and slot area.Howaner1-0/+173
2014-04-24Add armor to switch() in ItemHandler.cppHowaner1-1/+1
2014-04-24Fix armor in survival mode.Howaner1-0/+74
2014-04-20Fixed MSVC compilation.madmaxoft1-1/+1
2014-04-19Fixed Codedaniel09161-2/+3
2014-04-18Did some static analysis, fixed some bugs and optimized a lot of codejfhumann1-5/+6
2014-04-17Modified many thingsdaniel09161-16/+50
2014-04-16Fixed double enchanting itemsdaniel09161-2/+2
2014-04-15Added Book Enchantingdaniel09161-1/+1
2014-04-15Add more checks to cSlotAreaEnchantingHowaner1-88/+198
2014-04-14Added ItemPlaceCount in SlotAreadaniel09161-0/+32
Thanks to Howaner for helping
2014-04-14Blocked enchanting a item twicedaniel09161-6/+8
2014-04-14Fixed Bookshelf Checkingdaniel09161-8/+10
Code by LO1ZB
2014-04-14Bug fixesdaniel09161-15/+17
2014-04-13Fixed invisibility enchantmentsdaniel09161-0/+2
2014-04-13Some Fixesdaniel09161-1/+1
2014-04-12Fixed Bookshelves Checking (not completly)daniel09161-7/+10
2014-04-12Added complete Enchanting Systemdaniel09161-15/+34
http://minecraft.gamepedia.com/Enchantment_mechanics
2014-04-07Added Enchantment-Slot-Level generatingdaniel09161-9/+19
2014-02-28Fixed multiple gcc warnings about unused params.madmaxoft1-0/+30
2014-01-24Some updates for enchantingdaniel09161-12/+12
2014-01-20first changes for enchanting (not finished)daniel09161-0/+86
- added enchanting table block handler and added it to the blockhandler - added enchanting window - drop item in the slot 0 when the player close the window - added enchanting packet (1.7 only) - some more...
2014-01-17Removed internal cEntity::GetRot() usage.madmaxoft1-1/+1
2014-01-16Really did what xoft wantedTiger Wang1-5/+8
2014-01-16Removed obsoleted functionsTiger Wang1-3/+3
2014-01-16Possibly did what xoft wantedTiger Wang1-10/+3
2014-01-15Implemented custom names and loreTiger Wang1-0/+7
+ Added custom names and lore + Added saving and loading + Added writing and parsing of NBT
2014-01-07More MSVC warning fixes.madmaxoft1-2/+2
2013-12-08Removed unused variable ResultSlotTycho Bickerstaff1-1/+0
2013-12-09Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54worktycho1-1/+4
2013-12-07Added basic ender chestsTiger Wang1-0/+33
Note that they just mirror chests now, so no per player inventory.
2013-11-24Moved source to srcAlexander Harkness1-0/+0
2013-11-11Fixed dblclicking in crafting slot area.madmaxoft1-0/+14
Fixes #229.
2013-11-10Implemented inventory dblclick.madmaxoft1-4/+72
Implements #229.
2013-10-28Renamed cWindow constants to include the "wt" prefix.madmaxoft1-1/+1
2013-10-24Pickups now have collection delay when vomitedTiger Wang1-1/+1
Implements FS#394.
2013-09-09Added a few changes [SEE DESC]Tiger Wang1-1/+1
* Revised pickup comments * SlotArea pickup tossing now reflects Player.cpp * Removed unneeded ItemShears comment (was working already) * Sand and gravel pickups spawn with correct speed
2013-08-19Moved entities into the Entities subfolder.madmaxoft1-1/+1
2013-08-02Shift+clicking won't combine different item metas.madmaxoft1-1/+1
Fixes FS 424.
2013-07-29Changed everyting to Unix line endings.Alexander Harkness1-815/+815
2013-06-16Rewritten furnacesmadmaxoft@gmail.com1-41/+20
Furnaces now smelt the correct number of items. Furnaces store their contents in a cItemGrid. Furnace window is updated with correct items and progressbars. Furnace recipes now use ticks instead of milliseconds. Furnaces save and load their state completely, not missing a smelt operation. Hoppers take items out of furnaces. Dropped the cSlotAreaDropSpenser class, replaced it with generic cSlotAreaItemGrid git-svn-id: http://mc-server.googlecode.com/svn/trunk@1601 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-13Added hopper entity, it can suck items out of chests, dispensers, droppers and other hopppers above it.madmaxoft@gmail.com1-0/+20
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1587 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-02Shift + click doesn't "destroy" item enchantmentmadmaxoft@gmail.com1-5/+6
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1540 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-30LuaWindow: Initial code, the window can be opened, but not much manipulatedmadmaxoft@gmail.com1-0/+31
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1532 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-30Implemented left-click inventory paintingmadmaxoft@gmail.com1-7/+7
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1529 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-28Moved BlockEntities to a separate foldermadmaxoft@gmail.com1-3/+3
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1527 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-26Implemented droppersmadmaxoft@gmail.com1-24/+8
Added a common ancestor class "DropSpenser" that has the common code for dropper and dispenser and is Lua-accessible, too. The Debuggers plugin now triggers both droppers and dispensers when rclking them with a redstone torch. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1514 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-24Refactored cInventory to use cItemGrid for the actual Storagemadmaxoft@gmail.com1-1/+1
This makes the API more orthogonal and is easier to use in the plugins. Also changes in the inventory are now propagated to the needed places (armor updates to BroadcastEntityEquipment etc.) even when the inventory is changed by a plugin. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1503 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-19Inventory code cleanup, players can now see each other's armormadmaxoft@gmail.com1-2/+2
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1493 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-08Refactored window clicking code to use different click actionsmadmaxoft@gmail.com1-68/+79
First part of solving FS #371; should fix #370. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1459 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-10Dispensers rewritten to use ItemGridmadmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1383 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-10Added cItemGrid to represent an XY grid of items; converted chests to use cItemGrid.madmaxoft@gmail.com1-3/+3
http://forum.mc-server.org/showthread.php?tid=831 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1380 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-09Pickups are now being saved into Anvil.madmaxoft@gmail.com1-1/+1
Also changed cEntity rotation datatype to double git-svn-id: http://mc-server.googlecode.com/svn/trunk@1262 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-12Merged branch "branches/hooks" into "trunk".madmaxoft@gmail.com1-10/+10
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-08Fixed rclk in doublechestsmadmaxoft@gmail.com1-1/+48
FS #284 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1127 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-19Added dispensers (they can't dispense items yet)luksor111@gmail.com1-0/+48
Fixed crash when digging snow Moved BlockPlace hook check, so Core plugin will no longer block item usage Player chat messages are now visible in the console git-svn-id: http://mc-server.googlecode.com/svn/trunk@1081 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-24Fixed issues with pickups. sebi.noreply@gmail.com1-1/+2
* Now when picking up max. stack amount is checked. * Added cInventory::AddItemAnyAmount() which will not fail if it cannot add all items (it will just modify amount) * If there is no space in inventory and picking up stacked items, it will try to fill stacks already in inventory, partially picking up the item. * When closing inventory player will drop any items it's currently 'dragging' git-svn-id: http://mc-server.googlecode.com/svn/trunk@1008 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-29SlotArea: removed excessive loggingmadmaxoft@gmail.com1-4/+0
git-svn-id: http://mc-server.googlecode.com/svn/trunk@904 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-26Fixed a bug in the inventory system where it would de-sync when dragging items with non-default metadata/healthfaketruth1-1/+1
Android: Updated VS2008 project to point to correct Android files Android: Updated makefiles to compile CryptoPP Android: Modified CryptoPP config.h and misc.cpp so it compiles for Android Android: Added pretty MCServer icons git-svn-id: http://mc-server.googlecode.com/svn/trunk@893 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-24Source files cleanup: The rest of the files renamed.madmaxoft@gmail.com1-5/+5
git-svn-id: http://mc-server.googlecode.com/svn/trunk@887 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-23Source files cleanup: UI files renamedmadmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@878 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-23Tweaked logging.madmaxoft@gmail.com1-5/+5
Less output for UI. More output for player pos confirming (FS #245) and for player spawning git-svn-id: http://mc-server.googlecode.com/svn/trunk@875 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-21Fixed a potential crash in shift-click (gcc warning)madmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@871 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-21Working shift-click support in crafting areas; window update working in 1.3.2madmaxoft@gmail.com1-5/+52
git-svn-id: http://mc-server.googlecode.com/svn/trunk@869 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-20UI: Added shift-click support to most slot areas, except crafting.madmaxoft@gmail.com1-25/+106
Also fixed survival inventory's crafting grid not working. git-svn-id: http://mc-server.googlecode.com/svn/trunk@868 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-20Refactored windows.madmaxoft@gmail.com1-0/+569
As described on the forum: http://forum.mc-server.org/showthread.php?tid=561 For now, only basic clicking works; shift-click not implemented yet. git-svn-id: http://mc-server.googlecode.com/svn/trunk@867 0a769ca7-a7f5-676a-18bf-c427514a06d6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 23:51:45 +0100