summaryrefslogtreecommitdiffstats
path: root/src/BlockType.cpp (unfollow)
Commit message (Collapse)AuthorFilesLines
2023-06-21Fixed a wrong format string.Mattes D1-1/+1
Thanks to dyexlzc for noticing.
2023-05-16Removed all Printf-family functions from StringUtils.Mattes D1-5/+3
Replaced them with fmt::format calls, including changes to the format strings. Also changed the format strings to use FMT_STRING, so that the format is checked compile-time against the arguments. Also fixed code-style violations already present in the code.
2020-05-10Cleanup some workarounds and warnings (#4735)peterbell101-31/+9
* Cleanup thread_local usage in FastRandom * Use constexpr to avoid clang warning * Fix more Wglobal-constructor warnings * Make MSVC happy?
2020-04-03Pulled the BlockID and BlockInfo headers from Globals.h. (#4591)Mattes D1-184/+2
The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change) The BlockInfo.h file was removed from Globals.h (main change) The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics) The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor) Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header. That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified. eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values
2018-07-26CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell101-0/+1
Add check for number of empty lines between functions and fix the corresponding failures
2018-02-05Deal with covered switches consistently (#4161)peterbell101-6/+1
* Fixes a number of "<function>: not all control paths return a value" warnings on MSVC. * Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults. * Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message()
2017-08-03Remove double includes part 2 (#3890)peterbell101-1/+0
2016-08-04Fixed RasPi builds of unit tests.Mattes D1-1/+3
On RasPi with gcc 4.8.2, the asserts wouldn't compile when tests were enabled. Enforced the assumption that ASSERT code is generated only in Debug builds.
2016-02-05Bulk clearing of whitespaceLogicParrot1-20/+20
2015-07-31Unified the doxy-comment format.Mattes D1-2/+3
2015-05-30Fixed reversed logic in StringToDimension.Lane Kolbly1-1/+1
2015-05-24Made -Weverything an error.tycho1-16/+22
2015-04-01Working as a Windows service. Starts and stops correctly.Anthony Birkett1-1/+28
Added "/service" switch, to prompt the binary to attempt starting as a service. Added service* methods, to control service startup. Split up main() into universalMain(), which contains the startup code for both service and normal start. Added cRoot::m_RunningAsService bool, Added cRoot::SetStopping(bool) to allow a stop request to be sent by the service controller. Added cBlockIDMap::init() to avoid loading items.ini before the working directory has been set.
2014-11-27Fixed BlockStringToType return value.Mattes D1-1/+1
-1 was not a valid BLOCKTYPE and would not be recognized by the callers, ever.
2014-10-29Fixed 1.8 world item format reading.Howaner1-1/+6
2014-10-23Merged IniFile into main MCS sources.Mattes D1-1/+1
2014-10-05Fixed eMonsterType Lua API mismatch.madmaxoft1-51/+0
2014-09-17Added first test to show the object can be createdTycho1-28/+28
2014-08-03Fixed a ToLua warning - operator = not supported.madmaxoft1-1/+1
2014-07-19Code style: Fixed braces on separate lines.madmaxoft1-1/+2
2014-07-17Fixed basic whitespace problems.madmaxoft1-1/+1
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
2014-06-17Added wither damage type, wither entity effect.archshift1-0/+3
2014-06-16Implemented PR suggestionsarchshift1-4/+0
Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef
2014-06-10Portal improvements and suggestionsTiger Wang1-0/+35
2014-05-01Fixed warning in BlockID.madmaxoft1-1/+1
2014-04-26Removed extraneous switch{} in Start()archshift1-2/+3
Squashed a warning.
2014-03-02Removed g_BlockXXX arraysandrew1-399/+0
2014-02-20Add Light weighted pressure platesHowaner1-0/+4
2014-02-04Added dtExplosion to damage<->string functions.madmaxoft1-1/+2
2014-02-02Fixed #624Tiger Wang1-0/+1
2014-01-27E_BLOCK_POTATOES isn't an solid block. Villagers were floating above them.STRWarrior1-0/+1
2014-01-12Multiple enhancements and fixes to minecartsTiger Wang1-0/+1
+ They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails
2014-01-11Renamed g_TorchPlaceable...Tiger Wang1-63/+63
...to g_FullyOccupiesVoxel, as recommended by @bearbin
2014-01-09Move biome definition to separate filesBill Derouin1-100/+0
2013-12-20Fixed repeaters delay, maybeTiger Wang1-0/+3
Also added basic daylight sensors, though because GetBlockSkylight always is 15, it doesn't work.
2013-12-20Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft1-6/+6
2013-11-26Fixed loads more of them.Alexander Harkness1-1/+1
2013-11-24Attempt to fix compilationTiger Wang1-1/+1
2013-11-24Moved source to srcAlexander Harkness1-0/+0
2013-11-18Redstone Megacommit [SEE DESC]Tiger Wang1-14/+15
+ Updated BlockID - look for yourself * Improved button, repeater, lever, and comparator code -> simplification and splitting of some stuff from the redstone simulator file * Fixed buttons not breaking when in an invalid game state * Fixed QueueSetBlock -> improved (AGAIN) piston code + Rewrote redstone simulator Fixes: #57, #58, #205, and part of #131. Fixes FS issues: 281, 116, and 102
2013-11-13Added the last bit of the enum, and alpha-sorted the switch.Alexander Harkness1-10/+13
2013-11-12Sorting by Name on g_BlockTransparentnesco1-4/+4
2013-11-12Update BlockID.cppnesco1-1/+1
2013-11-12Update BlockID.cppnesco1-3/+3
2013-11-12Assigning properties to the blocks recently added.nesco1-10/+19
2013-10-25cIniFile: Renamed functions to make meaning more explicit.madmaxoft1-4/+4
For example KeyComment() -> GetKeyComment() / AddKeyComment()
2013-10-25cIniFile doesn't store filename internally anymore.madmaxoft1-2/+2
2013-10-18StringToItem() recognizes "ItemName:Dmg" strings.madmaxoft1-18/+21
This allows commands such as "/i woodenshovel:40"
2013-10-15Update BlockID.cppSofapriester1-1/+1
Added g_BlockIsTorchPlaceable[E_BLOCK_STONE_BRICKS] = true; -> this should fix Issue #254 -> Please check if ok Thx
2013-10-12Added 1.7 biome constants.madmaxoft1-0/+42
2013-10-11Added GetIniItemSet() function.madmaxoft1-0/+15
It reads a block / item description from the specified INI file value and returns as cItem; stores and uses the default if value doesn't exist.
2013-10-01Added glass pane as transparent. Removed excess g_BlockOneHitDig[E_BLOCK_REDSTONE_WIRE].Samuel Barney1-1/+1
2013-09-18Implemented redstone comparatorsTiger Wang1-0/+6
They can be placed and toggled, but stills needs proper redstone support
2013-09-15Torches work properlyTiger Wang1-30/+75
Also fixed a naming inconsistency concerning quartz stairs.
2013-09-13Even more fixes [SEE DESC]Tiger Wang1-1/+1
* Fixed minecarts breaking completely due to stuff * Rails are now non solid again + Added IsRail inline bool - Removed Herobrine
2013-09-08Alpha-sorted g_BlockIsSnowable[].madmaxoft1-2/+2
2013-09-08Re-added the top line.STRWarrior1-0/+1
2013-09-08Added E_BLOCK_LILY_PAD to g_BlockIsSnowable.STRWarrior1-2/+3
2013-09-07Adding Water and Lava as transparency blocksmgueydan1-0/+4
2013-09-01Added dtRangedAttack, fixed faulty StringTODamageType()madmaxoft1-17/+22
2013-08-27Preliminary Minecart physics handling [SEE DESC]Tiger Wang1-1/+1
This commit includes physics handling for the following scenarios: Flat rails in orientations [N, S, W, E] Ascending/descending rails in orientations [N, S, W, E] Powered rails are NOT handled (they don't respond to redstone). Curved rails are NOT handled (I haven't figured out how to do them :P) Please note that I have not tried to emulate vanilla behaviour because of a lack of knowledge on velocity unites/C++. We can say it's a feature or something. :P
2013-08-20Updated block transparenciesTiger Wang1-0/+2
Now includes activator rails and piston extensions
2013-08-16Feature and bugfixes [SEE DESC]Tiger Wang1-0/+2
Added TNT and Hopper minecarts Fixed piston code failing without an extension set Repeaters are now broken Fixed not being able to place a minecart on an activator rail Added much needed comments on piston code Fixed minor formatting issue
2013-08-16Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX.madmaxoft1-33/+34
Also slightly improved the spawning algorithm.
2013-08-14Alpha sorted PistonBreakable listTiger Wang1-2/+3
2013-08-14Buncha bugfixes [SEE DESC]Tiger Wang1-4/+4
Fixed generation values not being written Fixed piston being able to push water Fixed ice creating a non-source block (still doesn't update though) Removed problematic piston code
2013-07-12Added a StringToMobType() function to the Lua API (patch contributed by STR_Warrior)madmaxoft@gmail.com1-0/+50
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1674 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-07Ice is a solid block.madmaxoft@gmail.com1-1/+0
Helps with FS #381 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1664 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-01Added DamageType translation to APImadmaxoft@gmail.com1-1/+101
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1639 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-22Added the End height and composition generators.madmaxoft@gmail.com1-0/+41
Also made the dimension in world.ini specifiable by a string. Exported StringToDimension() and StringToBiome() to Lua API. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1621 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-05Lighting: Fixed underwater lighting (FS #369)madmaxoft@gmail.com1-4/+4
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1444 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-05Added carrots and potatoes handling, bonemealing and proper lighting.madmaxoft@gmail.com1-0/+8
FS #166 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1359 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-01Cobweb lets light through.madmaxoft@gmail.com1-0/+1
Fix for FS #351 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1349 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-16Removed all E_ITEM_ symbols equivalent to E_BLOCK_, and all obsolete item and block symbols.madmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1218 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-12Merged branch "branches/hooks" into "trunk".madmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-29Cauldrons and Brewing Stands are now placeableluksor111@gmail.com1-0/+1
Cauldrons can be filled with water and used to fill bottles git-svn-id: http://mc-server.googlecode.com/svn/trunk@1116 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-27Added flower potsluksor111@gmail.com1-25/+31
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1107 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-19Implemented double doorsluksor111@gmail.com1-0/+4
Implemented fence gate Updated g_BlockTransparent[] Doors can now only be opened by right clicking Doors will now drop when not supported by block git-svn-id: http://mc-server.googlecode.com/svn/trunk@1080 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-25Rails don't turn grass into dirt underneath them. (Patch contributed by STR_Warrior)madmaxoft@gmail.com1-0/+3
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1066 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-18Fixed wrong c++ standard assumptions about bools.madmaxoft@gmail.com1-2/+12
Should fix FS #265. http://forum.mc-server.org/showthread.php?tid=629&pid=5415#pid5415 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1053 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-23#grammarnazi: fixed tabs to spaces and alpha-sortmadmaxoft@gmail.com1-67/+68
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1007 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-23New Block property g_BlockIsSolid[]; Fixed ladder, torches and vines placement. (Patch contributed by funmaker)luksor111@gmail.com1-2/+64
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1005 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-21Top blocks are now snowed over, either normally, or in deep snow (patch contributed by funmaker, Luksor and Sebi)madmaxoft@gmail.com1-0/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1000 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-24Source files cleanup: The rest of the files renamed.madmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@887 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-20Refactored windows.madmaxoft@gmail.com1-0/+11
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-08ItemToString() now recognizes matches that are in the ini without metadata.madmaxoft@gmail.com1-0/+15
"323:0" -> "sign", although ini says "sign=323" only. git-svn-id: http://mc-server.googlecode.com/svn/trunk@856 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-08StringToItem() sets item's count to 1 after a successful parsemadmaxoft@gmail.com1-1/+3
git-svn-id: http://mc-server.googlecode.com/svn/trunk@854 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-08Fixed item damage not being set properly in StringToItem()madmaxoft@gmail.com1-0/+4
git-svn-id: http://mc-server.googlecode.com/svn/trunk@853 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-08Set leaves as a transparent block.madmaxoft@gmail.com1-0/+1
Initiated by STR_Warrior, http://forum.mc-server.org/showthread.php?tid=434&pid=4512#pid4512 git-svn-id: http://mc-server.googlecode.com/svn/trunk@852 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-08Another fix for the case-sensitiveness. WTF, STL allows different signatures for Debug and Release builds?madmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@849 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-08Fixed the case-sensitiveness of the item map.madmaxoft@gmail.com1-1/+10
git-svn-id: http://mc-server.googlecode.com/svn/trunk@848 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-08Added the ItemToString() and ItemTypeToString() functions.madmaxoft@gmail.com1-33/+148
Ref.: http://forum.mc-server.org/showthread.php?tid=434&pid=4506#pid4506 git-svn-id: http://mc-server.googlecode.com/svn/trunk@847 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-07Snow is not put atop vines by the snow finisher anymoremadmaxoft@gmail.com1-0/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@843 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-14Made cobwebs transparentmadmaxoft@gmail.com1-8/+9
git-svn-id: http://mc-server.googlecode.com/svn/trunk@731 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-16Some code improvementslapayo94@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@677 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-07-15A new Block handling system :olapayo94@gmail.com1-0/+38
It was really a lot of work :D Took me the complete weekend :D Would really like to here your opinion on this =) The aim of this is to put all the actions for one block in one place so it is not spread around the source. (ToPickup, Action in cWorld, Action in cChunk, Action here, action there :D) git-svn-id: http://mc-server.googlecode.com/svn/trunk@671 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-16Fixed lighting for cake, fence, fence gates, glass pane, iron bars, iron door and wooden doormadmaxoft@gmail.com1-0/+7
git-svn-id: http://mc-server.googlecode.com/svn/trunk@625 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-14Attempt to bring sanity to newlines across systems.cedeel@gmail.com1-325/+325
git-svn-id: http://mc-server.googlecode.com/svn/trunk@606 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-09Tall grass finally drops seedsmadmaxoft@gmail.com1-0/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@581 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-07Grass grows under vinesmadmaxoft@gmail.com1-0/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@569 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-06Hopefully fixed lighting around chests and cropsmadmaxoft@gmail.com1-0/+5
git-svn-id: http://mc-server.googlecode.com/svn/trunk@562 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-04Fixed Linux compilation.cedeel@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@550 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-04Added the new recipe parser, parsing the crafting.txt file. Included are a few recipes. The old parser still works, but will be replaced soon.madmaxoft@gmail.com1-1/+42
git-svn-id: http://mc-server.googlecode.com/svn/trunk@549 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-02Added the Biomal height generator, made it the default height generator.madmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@536 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-28Cacti don't gather snowmadmaxoft@gmail.com1-0/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@517 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-27Ice finisher generator; fixed snow on water.madmaxoft@gmail.com1-0/+4
git-svn-id: http://mc-server.googlecode.com/svn/trunk@515 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-27Added some useful biome synonyms; added block property IsSnowable; alphabetically sorted block property settingmadmaxoft@gmail.com1-50/+80
git-svn-id: http://mc-server.googlecode.com/svn/trunk@513 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-27Added the CheckerBoardBiomes parameter for setting biomes that CheckerBoard generates (#179). Added string-to-biome conversion (#183). Added OreNests to default Structures configuration.madmaxoft@gmail.com1-0/+56
git-svn-id: http://mc-server.googlecode.com/svn/trunk@506 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-25Merged the composable_generator branch into the trunkmadmaxoft@gmail.com1-0/+186
git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 12:25:10 +0200