flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
1,723 Commits 1 Branch 0 Tags 92 MiB
58a76a90dc
Commit Graph

39 Commits

Author SHA1 Message Date
madmaxoft
edb299db09 Shift+clicking won't combine different item metas. 
Fixes FS 424.
 2013-08-02 09:12:16 +02:00
Alexander Harkness
53e22b1185 Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
Tiger Wang
265fa6d750 Fixed Window Titles being MCS-* 
For example, MCS-Chest, MCS-DoubleChest, etc.
 2013-07-27 22:32:07 +01:00
madmaxoft@gmail.com
97eda34a94 Rewritten furnaces 
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-16 20:24:07 +00:00
madmaxoft@gmail.com
03c6bb9f85 Added hopper entity, it can suck items out of chests, dispensers, droppers and other hopppers above it. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1587 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-13 07:36:43 +00:00
madmaxoft@gmail.com
8ff22344af LuaWindow: Fixed memory leaks with unclosed windows 
A player disconnecting will now force all windows to close, not respecting any plugin's overrides.
http://forum.mc-server.org/showthread.php?tid=1146&pid=8350#pid8350

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1543 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-02 21:59:25 +00:00
madmaxoft@gmail.com
098c237a39 Shift + click doesn't "destroy" item enchantment 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1540 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-02 21:20:53 +00:00
madmaxoft@gmail.com
2eb1240e14 Added the OnClosing callback to cLuaWindow API 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1534 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-30 20:40:43 +00:00
madmaxoft@gmail.com
9684f90f83 LuaWindow: Initial code, the window can be opened, but not much manipulated 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1532 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-30 19:34:09 +00:00
madmaxoft@gmail.com
2d8d7795de Implemented right-click inventory painting 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1530 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-30 10:10:58 +00:00
madmaxoft@gmail.com
191479cd81 Implemented left-click inventory painting 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1529 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-30 08:40:13 +00:00
madmaxoft@gmail.com
9be27992e2 Moved BlockEntities to a separate folder 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1527 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-28 19:12:47 +00:00
madmaxoft@gmail.com
5c3235ecdc Implemented droppers 
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-26 14:39:04 +00:00
madmaxoft@gmail.com
a6c6818930 Fixed WindowOwner implementation 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1508 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-25 12:00:25 +00:00
madmaxoft@gmail.com
cf87169737 Refactored cInventory to use cItemGrid for the actual Storage 
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-24 07:30:39 +00:00
madmaxoft@gmail.com
90c398a392 Inventory code cleanup, players can now see each other's armor 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1493 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-19 18:22:37 +00:00
madmaxoft@gmail.com
7cbf36bf17 Refactored window clicking code to use different click actions 
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-05-08 09:45:07 +00:00
madmaxoft@gmail.com
dc878898f3 Dispensers rewritten to use ItemGrid 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1383 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-10 21:40:30 +00:00
madmaxoft@gmail.com
cc26f16463 Added cItemGrid to represent an XY grid of items; converted chests to use cItemGrid. 
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-04-10 19:52:03 +00:00
madmaxoft@gmail.com
4aed49a70f Fixed personal crafting grid not being tossed on inventory close. 
FS #355, http://www.mc-server.org/support/index.php?do=details&task_id=355

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1358 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-04 11:47:31 +00:00
madmaxoft@gmail.com
7593707713 Pickups are now being saved into Anvil. 
Also changed cEntity rotation datatype to double

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1262 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-09 14:35:43 +00:00
madmaxoft@gmail.com
43e6840719 Merged branch "branches/hooks" into "trunk". 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-01-12 04:46:01 +00:00
madmaxoft@gmail.com
71d71410fd Fixed rclk in doublechests 
FS #284

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1127 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-01-08 05:01:06 +00:00
luksor111@gmail.com
05d71675f6 Added dispensers (they can't dispense items yet) 
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-12-19 21:19:36 +00:00
sebi.noreply@gmail.com
e33e9111ab Fixed issues with pickups. 
* 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-10-24 12:48:25 +00:00
madmaxoft@gmail.com
e30bec4fd6 Double chests are now working, and with sound. (FS #69) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@993 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-20 21:53:09 +00:00
madmaxoft@gmail.com
c8fb57af72 Fixed memory leaks in cWindow and cProtocolRecognizer 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@910 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-29 19:55:18 +00:00
madmaxoft@gmail.com
09a7bec129 Hopefully fixed creative inventory tossing items out of the window. 
( http://forum.mc-server.org/showthread.php?tid=434&pid=4657#pid4657 )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@905 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-29 14:56:33 +00:00
madmaxoft@gmail.com
df0bffc222 SlotArea: removed excessive logging 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@904 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-29 14:55:10 +00:00
madmaxoft@gmail.com
4df23d19b7 Unified folder name-casing 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@902 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-29 13:59:32 +00:00
faketruth
987b6ac123 Fixed a bug in the inventory system where it would de-sync when dragging items with non-default metadata/health 
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-26 14:36:08 +00:00
madmaxoft@gmail.com
7a43f6be09 Sockets are now owned by SocketThreads instead of ClientHandle (FS #246 and FS #247) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@891 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-25 08:23:19 +00:00
madmaxoft@gmail.com
ecfe6ab65b Source files cleanup: The rest of the files renamed. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@887 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-23 22:09:57 +00:00
madmaxoft@gmail.com
f58c3f2e81 Source files cleanup: UI files renamed 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@878 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-23 17:19:34 +00:00
madmaxoft@gmail.com
578c9c4694 Tweaked logging. 
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-23 16:25:32 +00:00
madmaxoft@gmail.com
a7f9ce86cd Fixed a potential crash in shift-click (gcc warning) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@871 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-21 21:42:23 +00:00
madmaxoft@gmail.com
50c6a66092 Working shift-click support in crafting areas; window update working in 1.3.2 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@869 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-21 20:50:34 +00:00
madmaxoft@gmail.com
fdf8387092 UI: Added shift-click support to most slot areas, except crafting. 
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-20 20:10:46 +00:00
madmaxoft@gmail.com
bc466f07a4 Refactored windows. 
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
 2012-09-20 13:25:54 +00:00