diff options
-rw-r--r-- | CONTRIBUTORS | 10 | ||||
-rw-r--r-- | LICENSE | 9 | ||||
-rw-r--r-- | Server/Plugins/TestLuaRocks/TestLuaRocks.lua | 24 | ||||
-rw-r--r-- | dev-docs/.gitignore (renamed from docs/.gitignore) | 0 | ||||
-rw-r--r-- | dev-docs/API class inheritance - blockentities.gv (renamed from docs/API class inheritance - blockentities.gv) | 0 | ||||
-rw-r--r-- | dev-docs/API class inheritance - entities.gv (renamed from docs/API class inheritance - entities.gv) | 0 | ||||
-rw-r--r-- | dev-docs/Cubeset file format.html (renamed from docs/Cubeset file format.html) | 0 | ||||
-rw-r--r-- | dev-docs/Generator.html (renamed from docs/Generator.html) | 0 | ||||
-rw-r--r-- | dev-docs/Login sequence.txt (renamed from docs/Login sequence.txt) | 0 | ||||
-rw-r--r-- | dev-docs/NBT Examples/single chunk NBT data.txt (renamed from docs/NBT Examples/single chunk NBT data.txt) | 0 | ||||
-rw-r--r-- | dev-docs/NBT Examples/tile entities.txt (renamed from docs/NBT Examples/tile entities.txt) | 0 | ||||
-rw-r--r-- | dev-docs/Object ownership.gv (renamed from docs/Object ownership.gv) | 0 | ||||
-rw-r--r-- | dev-docs/Plugin API.md | 3 | ||||
-rw-r--r-- | dev-docs/SocketThreads states.gv (renamed from docs/SocketThreads states.gv) | 0 | ||||
-rw-r--r-- | dev-docs/Springs.ods (renamed from docs/Springs.ods) | bin | 27173 -> 27173 bytes | |||
-rw-r--r-- | dev-docs/_files.txt (renamed from docs/_files.txt) | 0 | ||||
-rw-r--r-- | dev-docs/img/biomalheights.jpg (renamed from docs/img/biomalheights.jpg) | bin | 77747 -> 77747 bytes | |||
-rw-r--r-- | dev-docs/img/biomeheights.jpg (renamed from docs/img/biomeheights.jpg) | bin | 16432 -> 16432 bytes | |||
-rw-r--r-- | dev-docs/img/biomeheightsavg.jpg (renamed from docs/img/biomeheightsavg.jpg) | bin | 14946 -> 14946 bytes | |||
-rw-r--r-- | dev-docs/img/biomes.jpg (renamed from docs/img/biomes.jpg) | bin | 12833 -> 12833 bytes | |||
-rw-r--r-- | dev-docs/img/densitymap.jpg (renamed from docs/img/densitymap.jpg) | bin | 29301 -> 29301 bytes | |||
-rw-r--r-- | dev-docs/img/distortedvoronoibiomes.png (renamed from docs/img/distortedvoronoibiomes.png) | bin | 6012 -> 6012 bytes | |||
-rw-r--r-- | dev-docs/img/finishers.jpg (renamed from docs/img/finishers.jpg) | bin | 14701 -> 14701 bytes | |||
-rw-r--r-- | dev-docs/img/gaussprobability.jpg (renamed from docs/img/gaussprobability.jpg) | bin | 12994 -> 12994 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_add_islands.png (renamed from docs/img/grownexample_add_islands.png) | bin | 1707 -> 1707 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_alt_biomes.png (renamed from docs/img/grownexample_alt_biomes.png) | bin | 1760 -> 1760 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_beaches.png (renamed from docs/img/grownexample_beaches.png) | bin | 1615 -> 1615 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_biome_edges.png (renamed from docs/img/grownexample_biome_edges.png) | bin | 1497 -> 1497 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_biomes.png (renamed from docs/img/grownexample_biomes.png) | bin | 1703 -> 1703 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_grp_edges.png (renamed from docs/img/grownexample_grp_edges.png) | bin | 1457 -> 1457 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_in1.png (renamed from docs/img/grownexample_in1.png) | bin | 1477 -> 1477 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_in2.png (renamed from docs/img/grownexample_in2.png) | bin | 1274 -> 1274 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_in3.png (renamed from docs/img/grownexample_in3.png) | bin | 1532 -> 1532 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_in_alt.png (renamed from docs/img/grownexample_in_alt.png) | bin | 1476 -> 1476 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_in_river.png (renamed from docs/img/grownexample_in_river.png) | bin | 1169 -> 1169 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_m_biomes.png (renamed from docs/img/grownexample_m_biomes.png) | bin | 1842 -> 1842 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_mix_river.png (renamed from docs/img/grownexample_mix_river.png) | bin | 1586 -> 1586 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_river.png (renamed from docs/img/grownexample_river.png) | bin | 1202 -> 1202 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_set_rnd.png (renamed from docs/img/grownexample_set_rnd.png) | bin | 1616 -> 1616 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_smooth.png (renamed from docs/img/grownexample_smooth.png) | bin | 1449 -> 1449 bytes | |||
-rw-r--r-- | dev-docs/img/grownexample_zoom.png (renamed from docs/img/grownexample_zoom.png) | bin | 2167 -> 2167 bytes | |||
-rw-r--r-- | dev-docs/img/heightmap.jpg (renamed from docs/img/heightmap.jpg) | bin | 27951 -> 27951 bytes | |||
-rw-r--r-- | dev-docs/img/jittergrid.jpg (renamed from docs/img/jittergrid.jpg) | bin | 18522 -> 18522 bytes | |||
-rw-r--r-- | dev-docs/img/jittergridlocality.jpg (renamed from docs/img/jittergridlocality.jpg) | bin | 15026 -> 15026 bytes | |||
-rw-r--r-- | dev-docs/img/multistepmapbiomes.png (renamed from docs/img/multistepmapbiomes.png) | bin | 11103 -> 11103 bytes | |||
-rw-r--r-- | dev-docs/img/multistepmapdistance.jpg (renamed from docs/img/multistepmapdistance.jpg) | bin | 16536 -> 16536 bytes | |||
-rw-r--r-- | dev-docs/img/multistepmapgrid.jpg (renamed from docs/img/multistepmapgrid.jpg) | bin | 22910 -> 22910 bytes | |||
-rw-r--r-- | dev-docs/img/perlin.jpg (renamed from docs/img/perlin.jpg) | bin | 24105 -> 24105 bytes | |||
-rw-r--r-- | dev-docs/img/perlincompositor1.jpg (renamed from docs/img/perlincompositor1.jpg) | bin | 15457 -> 15457 bytes | |||
-rw-r--r-- | dev-docs/img/perlincompositor2.jpg (renamed from docs/img/perlincompositor2.jpg) | bin | 29005 -> 29005 bytes | |||
-rw-r--r-- | dev-docs/img/perlincompositor3.jpg (renamed from docs/img/perlincompositor3.jpg) | bin | 21119 -> 21119 bytes | |||
-rw-r--r-- | dev-docs/img/perlinheightmap.jpg (renamed from docs/img/perlinheightmap.jpg) | bin | 53543 -> 53543 bytes | |||
-rw-r--r-- | dev-docs/img/perlinrivers1.jpg (renamed from docs/img/perlinrivers1.jpg) | bin | 20688 -> 20688 bytes | |||
-rw-r--r-- | dev-docs/img/perlinrivers2.jpg (renamed from docs/img/perlinrivers2.jpg) | bin | 28926 -> 28926 bytes | |||
-rw-r--r-- | dev-docs/img/perlinrivers3.jpg (renamed from docs/img/perlinrivers3.jpg) | bin | 28791 -> 28791 bytes | |||
-rw-r--r-- | dev-docs/img/roofprobability.jpg (renamed from docs/img/roofprobability.jpg) | bin | 16679 -> 16679 bytes | |||
-rw-r--r-- | dev-docs/img/smallfoliageclumps.jpg (renamed from docs/img/smallfoliageclumps.jpg) | bin | 15867 -> 15867 bytes | |||
-rw-r--r-- | dev-docs/img/smoothedgrown_1.png (renamed from docs/img/smoothedgrown_1.png) | bin | 2082 -> 2082 bytes | |||
-rw-r--r-- | dev-docs/img/smoothedgrown_2.png (renamed from docs/img/smoothedgrown_2.png) | bin | 1815 -> 1815 bytes | |||
-rw-r--r-- | dev-docs/img/smoothedgrown_3.png (renamed from docs/img/smoothedgrown_3.png) | bin | 1701 -> 1701 bytes | |||
-rw-r--r-- | dev-docs/img/smoothedgrown_4.png (renamed from docs/img/smoothedgrown_4.png) | bin | 1571 -> 1571 bytes | |||
-rw-r--r-- | dev-docs/img/smoothedgrown_5.png (renamed from docs/img/smoothedgrown_5.png) | bin | 1537 -> 1537 bytes | |||
-rw-r--r-- | dev-docs/img/smoothedgrown_6.png (renamed from docs/img/smoothedgrown_6.png) | bin | 1546 -> 1546 bytes | |||
-rw-r--r-- | dev-docs/img/smoothedgrown_7.png (renamed from docs/img/smoothedgrown_7.png) | bin | 1363 -> 1363 bytes | |||
-rw-r--r-- | dev-docs/img/temperaturehumiditydecisionhills.jpg (renamed from docs/img/temperaturehumiditydecisionhills.jpg) | bin | 32979 -> 32979 bytes | |||
-rw-r--r-- | dev-docs/img/temperaturehumiditydecisionsimple.jpg (renamed from docs/img/temperaturehumiditydecisionsimple.jpg) | bin | 18201 -> 18201 bytes | |||
-rw-r--r-- | dev-docs/img/terraincomposition.jpg (renamed from docs/img/terraincomposition.jpg) | bin | 15748 -> 15748 bytes | |||
-rw-r--r-- | dev-docs/img/terrainheight.jpg (renamed from docs/img/terrainheight.jpg) | bin | 11009 -> 11009 bytes | |||
-rw-r--r-- | dev-docs/img/twolevelbiomes.png (renamed from docs/img/twolevelbiomes.png) | bin | 33816 -> 33816 bytes | |||
-rw-r--r-- | dev-docs/img/twolevellargeareas.jpg (renamed from docs/img/twolevellargeareas.jpg) | bin | 17419 -> 17419 bytes | |||
-rw-r--r-- | dev-docs/img/twolevelsmallareas.jpg (renamed from docs/img/twolevelsmallareas.jpg) | bin | 23550 -> 23550 bytes | |||
-rw-r--r-- | dev-docs/img/twolevelsmallgrid.jpg (renamed from docs/img/twolevelsmallgrid.jpg) | bin | 39141 -> 39141 bytes | |||
-rw-r--r-- | dev-docs/img/vanilla_springs_huge.png (renamed from docs/img/vanilla_springs_huge.png) | bin | 29827 -> 29827 bytes | |||
-rw-r--r-- | dev-docs/img/voronoi.png (renamed from docs/img/voronoi.png) | bin | 19306 -> 19306 bytes | |||
-rw-r--r-- | dev-docs/img/voronoijitterbiomes.png (renamed from docs/img/voronoijitterbiomes.png) | bin | 4268 -> 4268 bytes | |||
-rw-r--r-- | dev-docs/img/zoomedgrown_1.png (renamed from docs/img/zoomedgrown_1.png) | bin | 817 -> 817 bytes | |||
-rw-r--r-- | dev-docs/img/zoomedgrown_2.png (renamed from docs/img/zoomedgrown_2.png) | bin | 880 -> 880 bytes | |||
-rw-r--r-- | dev-docs/img/zoomedgrown_3.png (renamed from docs/img/zoomedgrown_3.png) | bin | 955 -> 955 bytes | |||
-rw-r--r-- | dev-docs/img/zoomedgrown_4.png (renamed from docs/img/zoomedgrown_4.png) | bin | 1116 -> 1116 bytes | |||
-rw-r--r-- | dev-docs/img/zoomedgrown_5.png (renamed from docs/img/zoomedgrown_5.png) | bin | 1516 -> 1516 bytes | |||
-rw-r--r-- | dev-docs/img/zoomedgrown_6.png (renamed from docs/img/zoomedgrown_6.png) | bin | 2033 -> 2033 bytes | |||
-rw-r--r-- | dev-docs/img/zoomedgrown_7.png (renamed from docs/img/zoomedgrown_7.png) | bin | 2978 -> 2978 bytes | |||
-rw-r--r-- | dev-docs/js/ValueMap.js (renamed from docs/js/ValueMap.js) | 0 | ||||
-rw-r--r-- | dev-docs/js/grown.js (renamed from docs/js/grown.js) | 0 | ||||
-rw-r--r-- | dev-docs/style.css (renamed from docs/style.css) | 0 | ||||
-rw-r--r-- | src/Bindings/LuaFunctions.h | 1 | ||||
-rw-r--r-- | src/BlockInServerPluginInterface.h | 4 | ||||
-rw-r--r-- | src/Blocks/BlockAnvil.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockBed.h | 4 | ||||
-rw-r--r-- | src/Blocks/BlockBrewingStand.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockFlowerPot.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockFurnace.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockIce.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockLadder.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockLeaves.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockLilypad.h | 2 | ||||
-rw-r--r-- | src/Blocks/BlockMobSpawner.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockNetherWart.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockOre.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockPortal.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockRail.h | 2 | ||||
-rw-r--r-- | src/Blocks/BlockRedstone.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockRedstoneTorch.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockSapling.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockSignPost.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockSlab.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockStems.h | 1 | ||||
-rw-r--r-- | src/Blocks/BlockVine.h | 4 | ||||
-rw-r--r-- | src/Blocks/BlockWallSign.h | 1 | ||||
-rw-r--r-- | src/Blocks/WorldInterface.h | 8 | ||||
-rw-r--r-- | src/Chunk.h | 2 | ||||
-rw-r--r-- | src/ClientHandle.h | 4 | ||||
-rw-r--r-- | src/Cuboid.cpp | 31 | ||||
-rw-r--r-- | src/Cuboid.h | 24 | ||||
-rw-r--r-- | src/Entities/SplashPotionEntity.h | 4 | ||||
-rw-r--r-- | src/Generating/PieceGeneratorBFSTree.h | 1 | ||||
-rw-r--r-- | src/Generating/PieceStructuresGen.h | 1 | ||||
-rw-r--r-- | src/HTTP/HTTPMessage.h | 1 | ||||
-rw-r--r-- | src/HTTP/HTTPServer.h | 1 | ||||
-rw-r--r-- | src/Items/ItemAxe.h | 2 | ||||
-rw-r--r-- | src/Items/ItemBucket.h | 1 | ||||
-rw-r--r-- | src/Items/ItemEmptyMap.h | 1 | ||||
-rw-r--r-- | src/Items/ItemFishingRod.h | 1 | ||||
-rw-r--r-- | src/Items/ItemHandler.h | 3 | ||||
-rw-r--r-- | src/Items/ItemLighter.h | 1 | ||||
-rw-r--r-- | src/Items/ItemMap.h | 1 | ||||
-rw-r--r-- | src/Items/ItemPickaxe.h | 4 | ||||
-rw-r--r-- | src/Items/ItemPotion.h | 2 | ||||
-rw-r--r-- | src/Items/ItemShovel.h | 2 | ||||
-rw-r--r-- | src/Items/ItemSlab.h | 1 | ||||
-rw-r--r-- | src/Items/ItemSword.h | 2 | ||||
-rw-r--r-- | src/MobSpawner.h | 6 | ||||
-rw-r--r-- | src/Mobs/Monster.h | 4 | ||||
-rw-r--r-- | src/Mobs/Ocelot.h | 1 | ||||
-rw-r--r-- | src/Mobs/Wolf.h | 2 | ||||
-rw-r--r-- | src/OSSupport/NetworkSingleton.h | 1 | ||||
-rw-r--r-- | src/Protocol/Packetizer.h | 5 | ||||
-rw-r--r-- | src/Protocol/Protocol.h | 3 | ||||
-rw-r--r-- | src/Simulator/FireSimulator.h | 1 | ||||
-rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator/RedstoneLampHandler.h | 1 | ||||
-rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h | 2 | ||||
-rw-r--r-- | src/UI/SlotArea.h | 3 | ||||
-rw-r--r-- | src/WorldStorage/FireworksSerializer.h | 1 | ||||
-rwxr-xr-x | src/WorldStorage/WSSAnvil.h | 3 |
144 files changed, 79 insertions, 133 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0cf95af2a..84af3215a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,4 +1,9 @@ -Many people have contributed to Cuberite, and this list attempts to broadcast at least some of them. +This file contains all known copyright holders of this software, as far as is +practically possible to ascertain. + +If you contribute to this software you must add yourself to this file, to +indicate your agreement to license your contributions according to the license +as provided in the LICENSE file. Altenius BasedDoge (Donated AlchemistVillage prefabs) @@ -53,6 +58,3 @@ WebFreak001 worktycho xoft (Mattes Dolak/madmaxoft on GH) Yeeeeezus (Donated AlchemistVillage prefabs) - -Please add yourself to this list if you contribute to the official Cuberite project -and license your work under the Apache License 2.0 @@ -1,7 +1,10 @@ Cuberite: A lightweight, fast and extensible game server for Minecraft -www: https://github.com/cuberite/cuberite - -Copyright 2011-2016 Cuberite Team +www: https://cuberite.org + +Copyright 2011-2017 Cuberite Contributors + +A full list of known copyright holders can be found in the CONTRIBUTORS file +to be distributed with all copies of this software. ------ diff --git a/Server/Plugins/TestLuaRocks/TestLuaRocks.lua b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua index a4c2be6f8..44a545032 100644 --- a/Server/Plugins/TestLuaRocks/TestLuaRocks.lua +++ b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua @@ -20,14 +20,14 @@ local http = require("socket.http"); -LOGINFO("Trying to download a webpage..."); -local body, code, headers = http.request('https://forum.cuberite.org/'); -LOG("code: " .. tostring(code)); -LOG("headers: "); +LOGINFO("Trying to download a webpage...") +local body, code, headers = http.request('https://forum.cuberite.org/') +LOG("code: " .. tostring(code)) +LOG("headers: ") for k, v in pairs(headers or {}) do - LOG(" " .. k .. ": " .. v); + LOG(" " .. k .. ": " .. v) end -LOG("body length: " .. string.len(body)); +LOG("body length: " .. string.len(body)) @@ -35,15 +35,15 @@ LOG("body length: " .. string.len(body)); function Initialize(a_Plugin) if (socket == nil) then - LOG("LuaSocket not found"); + LOGWARNING("LuaSocket not found") else - LOG("LuaSocket loaded"); + LOG("LuaSocket loaded") end if (log30 == nil) then - LOG("30log not found"); + LOGWARNING("30log not found") else - LOG("30log loaded"); + LOG("30log loaded") end - LOGINFO("Preventing plugin load so that it may be requested again from the webadmin."); - return false; + LOGINFO("Reload plugin from console or webadmin to rerun tests.") + return false end diff --git a/docs/.gitignore b/dev-docs/.gitignore index f6caf1c11..f6caf1c11 100644 --- a/docs/.gitignore +++ b/dev-docs/.gitignore diff --git a/docs/API class inheritance - blockentities.gv b/dev-docs/API class inheritance - blockentities.gv index 966588c5f..966588c5f 100644 --- a/docs/API class inheritance - blockentities.gv +++ b/dev-docs/API class inheritance - blockentities.gv diff --git a/docs/API class inheritance - entities.gv b/dev-docs/API class inheritance - entities.gv index 4e167e1d3..4e167e1d3 100644 --- a/docs/API class inheritance - entities.gv +++ b/dev-docs/API class inheritance - entities.gv diff --git a/docs/Cubeset file format.html b/dev-docs/Cubeset file format.html index 6ead2e700..6ead2e700 100644 --- a/docs/Cubeset file format.html +++ b/dev-docs/Cubeset file format.html diff --git a/docs/Generator.html b/dev-docs/Generator.html index 4d17826c1..4d17826c1 100644 --- a/docs/Generator.html +++ b/dev-docs/Generator.html diff --git a/docs/Login sequence.txt b/dev-docs/Login sequence.txt index df9d386c6..df9d386c6 100644 --- a/docs/Login sequence.txt +++ b/dev-docs/Login sequence.txt diff --git a/docs/NBT Examples/single chunk NBT data.txt b/dev-docs/NBT Examples/single chunk NBT data.txt index 905d6465c..905d6465c 100644 --- a/docs/NBT Examples/single chunk NBT data.txt +++ b/dev-docs/NBT Examples/single chunk NBT data.txt diff --git a/docs/NBT Examples/tile entities.txt b/dev-docs/NBT Examples/tile entities.txt index e16ae45a7..e16ae45a7 100644 --- a/docs/NBT Examples/tile entities.txt +++ b/dev-docs/NBT Examples/tile entities.txt diff --git a/docs/Object ownership.gv b/dev-docs/Object ownership.gv index 29e0407a6..29e0407a6 100644 --- a/docs/Object ownership.gv +++ b/dev-docs/Object ownership.gv diff --git a/dev-docs/Plugin API.md b/dev-docs/Plugin API.md new file mode 100644 index 000000000..6a0fd9a0e --- /dev/null +++ b/dev-docs/Plugin API.md @@ -0,0 +1,3 @@ +# Looking for the API documentation for Lua plugins? + +See the [cuberite website](api.cuberite.org) or browse the [source](https://github.com/cuberite/cuberite/tree/master/Server/Plugins/APIDump). diff --git a/docs/SocketThreads states.gv b/dev-docs/SocketThreads states.gv index 5afaa5370..5afaa5370 100644 --- a/docs/SocketThreads states.gv +++ b/dev-docs/SocketThreads states.gv diff --git a/docs/Springs.ods b/dev-docs/Springs.ods Binary files differindex 4b3559f1d..4b3559f1d 100644 --- a/docs/Springs.ods +++ b/dev-docs/Springs.ods diff --git a/docs/_files.txt b/dev-docs/_files.txt index 85a4253c1..85a4253c1 100644 --- a/docs/_files.txt +++ b/dev-docs/_files.txt diff --git a/docs/img/biomalheights.jpg b/dev-docs/img/biomalheights.jpg Binary files differindex a01faef87..a01faef87 100644 --- a/docs/img/biomalheights.jpg +++ b/dev-docs/img/biomalheights.jpg diff --git a/docs/img/biomeheights.jpg b/dev-docs/img/biomeheights.jpg Binary files differindex 9dda27b0e..9dda27b0e 100644 --- a/docs/img/biomeheights.jpg +++ b/dev-docs/img/biomeheights.jpg diff --git a/docs/img/biomeheightsavg.jpg b/dev-docs/img/biomeheightsavg.jpg Binary files differindex c8217cafc..c8217cafc 100644 --- a/docs/img/biomeheightsavg.jpg +++ b/dev-docs/img/biomeheightsavg.jpg diff --git a/docs/img/biomes.jpg b/dev-docs/img/biomes.jpg Binary files differindex 59c23b870..59c23b870 100644 --- a/docs/img/biomes.jpg +++ b/dev-docs/img/biomes.jpg diff --git a/docs/img/densitymap.jpg b/dev-docs/img/densitymap.jpg Binary files differindex a7a7b3f36..a7a7b3f36 100644 --- a/docs/img/densitymap.jpg +++ b/dev-docs/img/densitymap.jpg diff --git a/docs/img/distortedvoronoibiomes.png b/dev-docs/img/distortedvoronoibiomes.png Binary files differindex d56dff347..d56dff347 100644 --- a/docs/img/distortedvoronoibiomes.png +++ b/dev-docs/img/distortedvoronoibiomes.png diff --git a/docs/img/finishers.jpg b/dev-docs/img/finishers.jpg Binary files differindex 06f7485c3..06f7485c3 100644 --- a/docs/img/finishers.jpg +++ b/dev-docs/img/finishers.jpg diff --git a/docs/img/gaussprobability.jpg b/dev-docs/img/gaussprobability.jpg Binary files differindex 77da24748..77da24748 100644 --- a/docs/img/gaussprobability.jpg +++ b/dev-docs/img/gaussprobability.jpg diff --git a/docs/img/grownexample_add_islands.png b/dev-docs/img/grownexample_add_islands.png Binary files differindex f69faaaf1..f69faaaf1 100644 --- a/docs/img/grownexample_add_islands.png +++ b/dev-docs/img/grownexample_add_islands.png diff --git a/docs/img/grownexample_alt_biomes.png b/dev-docs/img/grownexample_alt_biomes.png Binary files differindex 866d774e2..866d774e2 100644 --- a/docs/img/grownexample_alt_biomes.png +++ b/dev-docs/img/grownexample_alt_biomes.png diff --git a/docs/img/grownexample_beaches.png b/dev-docs/img/grownexample_beaches.png Binary files differindex a84fb0eff..a84fb0eff 100644 --- a/docs/img/grownexample_beaches.png +++ b/dev-docs/img/grownexample_beaches.png diff --git a/docs/img/grownexample_biome_edges.png b/dev-docs/img/grownexample_biome_edges.png Binary files differindex 58de63aef..58de63aef 100644 --- a/docs/img/grownexample_biome_edges.png +++ b/dev-docs/img/grownexample_biome_edges.png diff --git a/docs/img/grownexample_biomes.png b/dev-docs/img/grownexample_biomes.png Binary files differindex ecd8af29b..ecd8af29b 100644 --- a/docs/img/grownexample_biomes.png +++ b/dev-docs/img/grownexample_biomes.png diff --git a/docs/img/grownexample_grp_edges.png b/dev-docs/img/grownexample_grp_edges.png Binary files differindex 2ac32b9a6..2ac32b9a6 100644 --- a/docs/img/grownexample_grp_edges.png +++ b/dev-docs/img/grownexample_grp_edges.png diff --git a/docs/img/grownexample_in1.png b/dev-docs/img/grownexample_in1.png Binary files differindex 2238886ab..2238886ab 100644 --- a/docs/img/grownexample_in1.png +++ b/dev-docs/img/grownexample_in1.png diff --git a/docs/img/grownexample_in2.png b/dev-docs/img/grownexample_in2.png Binary files differindex 9ef9f6ae2..9ef9f6ae2 100644 --- a/docs/img/grownexample_in2.png +++ b/dev-docs/img/grownexample_in2.png diff --git a/docs/img/grownexample_in3.png b/dev-docs/img/grownexample_in3.png Binary files differindex 95d6608b5..95d6608b5 100644 --- a/docs/img/grownexample_in3.png +++ b/dev-docs/img/grownexample_in3.png diff --git a/docs/img/grownexample_in_alt.png b/dev-docs/img/grownexample_in_alt.png Binary files differindex 59979ed62..59979ed62 100644 --- a/docs/img/grownexample_in_alt.png +++ b/dev-docs/img/grownexample_in_alt.png diff --git a/docs/img/grownexample_in_river.png b/dev-docs/img/grownexample_in_river.png Binary files differindex 58556369d..58556369d 100644 --- a/docs/img/grownexample_in_river.png +++ b/dev-docs/img/grownexample_in_river.png diff --git a/docs/img/grownexample_m_biomes.png b/dev-docs/img/grownexample_m_biomes.png Binary files differindex c3d7079ae..c3d7079ae 100644 --- a/docs/img/grownexample_m_biomes.png +++ b/dev-docs/img/grownexample_m_biomes.png diff --git a/docs/img/grownexample_mix_river.png b/dev-docs/img/grownexample_mix_river.png Binary files differindex 81899a8c7..81899a8c7 100644 --- a/docs/img/grownexample_mix_river.png +++ b/dev-docs/img/grownexample_mix_river.png diff --git a/docs/img/grownexample_river.png b/dev-docs/img/grownexample_river.png Binary files differindex cb07f44dd..cb07f44dd 100644 --- a/docs/img/grownexample_river.png +++ b/dev-docs/img/grownexample_river.png diff --git a/docs/img/grownexample_set_rnd.png b/dev-docs/img/grownexample_set_rnd.png Binary files differindex 5b7a2d254..5b7a2d254 100644 --- a/docs/img/grownexample_set_rnd.png +++ b/dev-docs/img/grownexample_set_rnd.png diff --git a/docs/img/grownexample_smooth.png b/dev-docs/img/grownexample_smooth.png Binary files differindex bfd43f6ef..bfd43f6ef 100644 --- a/docs/img/grownexample_smooth.png +++ b/dev-docs/img/grownexample_smooth.png diff --git a/docs/img/grownexample_zoom.png b/dev-docs/img/grownexample_zoom.png Binary files differindex 7afffe50b..7afffe50b 100644 --- a/docs/img/grownexample_zoom.png +++ b/dev-docs/img/grownexample_zoom.png diff --git a/docs/img/heightmap.jpg b/dev-docs/img/heightmap.jpg Binary files differindex c7eb5c865..c7eb5c865 100644 --- a/docs/img/heightmap.jpg +++ b/dev-docs/img/heightmap.jpg diff --git a/docs/img/jittergrid.jpg b/dev-docs/img/jittergrid.jpg Binary files differindex f8066aa72..f8066aa72 100644 --- a/docs/img/jittergrid.jpg +++ b/dev-docs/img/jittergrid.jpg diff --git a/docs/img/jittergridlocality.jpg b/dev-docs/img/jittergridlocality.jpg Binary files differindex 64414c878..64414c878 100644 --- a/docs/img/jittergridlocality.jpg +++ b/dev-docs/img/jittergridlocality.jpg diff --git a/docs/img/multistepmapbiomes.png b/dev-docs/img/multistepmapbiomes.png Binary files differindex d32ac3d8e..d32ac3d8e 100644 --- a/docs/img/multistepmapbiomes.png +++ b/dev-docs/img/multistepmapbiomes.png diff --git a/docs/img/multistepmapdistance.jpg b/dev-docs/img/multistepmapdistance.jpg Binary files differindex 9f7cfd11b..9f7cfd11b 100644 --- a/docs/img/multistepmapdistance.jpg +++ b/dev-docs/img/multistepmapdistance.jpg diff --git a/docs/img/multistepmapgrid.jpg b/dev-docs/img/multistepmapgrid.jpg Binary files differindex 51dd81c46..51dd81c46 100644 --- a/docs/img/multistepmapgrid.jpg +++ b/dev-docs/img/multistepmapgrid.jpg diff --git a/docs/img/perlin.jpg b/dev-docs/img/perlin.jpg Binary files differindex 499fcdeae..499fcdeae 100644 --- a/docs/img/perlin.jpg +++ b/dev-docs/img/perlin.jpg diff --git a/docs/img/perlincompositor1.jpg b/dev-docs/img/perlincompositor1.jpg Binary files differindex 0d8f93cd9..0d8f93cd9 100644 --- a/docs/img/perlincompositor1.jpg +++ b/dev-docs/img/perlincompositor1.jpg diff --git a/docs/img/perlincompositor2.jpg b/dev-docs/img/perlincompositor2.jpg Binary files differindex 11fc5b51d..11fc5b51d 100644 --- a/docs/img/perlincompositor2.jpg +++ b/dev-docs/img/perlincompositor2.jpg diff --git a/docs/img/perlincompositor3.jpg b/dev-docs/img/perlincompositor3.jpg Binary files differindex 46a2583ba..46a2583ba 100644 --- a/docs/img/perlincompositor3.jpg +++ b/dev-docs/img/perlincompositor3.jpg diff --git a/docs/img/perlinheightmap.jpg b/dev-docs/img/perlinheightmap.jpg Binary files differindex d941a2fc6..d941a2fc6 100644 --- a/docs/img/perlinheightmap.jpg +++ b/dev-docs/img/perlinheightmap.jpg diff --git a/docs/img/perlinrivers1.jpg b/dev-docs/img/perlinrivers1.jpg Binary files differindex b11373fa7..b11373fa7 100644 --- a/docs/img/perlinrivers1.jpg +++ b/dev-docs/img/perlinrivers1.jpg diff --git a/docs/img/perlinrivers2.jpg b/dev-docs/img/perlinrivers2.jpg Binary files differindex bbbcaa276..bbbcaa276 100644 --- a/docs/img/perlinrivers2.jpg +++ b/dev-docs/img/perlinrivers2.jpg diff --git a/docs/img/perlinrivers3.jpg b/dev-docs/img/perlinrivers3.jpg Binary files differindex 3cf043e6e..3cf043e6e 100644 --- a/docs/img/perlinrivers3.jpg +++ b/dev-docs/img/perlinrivers3.jpg diff --git a/docs/img/roofprobability.jpg b/dev-docs/img/roofprobability.jpg Binary files differindex e7a155113..e7a155113 100644 --- a/docs/img/roofprobability.jpg +++ b/dev-docs/img/roofprobability.jpg diff --git a/docs/img/smallfoliageclumps.jpg b/dev-docs/img/smallfoliageclumps.jpg Binary files differindex 4cc6cbc00..4cc6cbc00 100644 --- a/docs/img/smallfoliageclumps.jpg +++ b/dev-docs/img/smallfoliageclumps.jpg diff --git a/docs/img/smoothedgrown_1.png b/dev-docs/img/smoothedgrown_1.png Binary files differindex 16e563f96..16e563f96 100644 --- a/docs/img/smoothedgrown_1.png +++ b/dev-docs/img/smoothedgrown_1.png diff --git a/docs/img/smoothedgrown_2.png b/dev-docs/img/smoothedgrown_2.png Binary files differindex 2d97cfb4e..2d97cfb4e 100644 --- a/docs/img/smoothedgrown_2.png +++ b/dev-docs/img/smoothedgrown_2.png diff --git a/docs/img/smoothedgrown_3.png b/dev-docs/img/smoothedgrown_3.png Binary files differindex 2d4d13f49..2d4d13f49 100644 --- a/docs/img/smoothedgrown_3.png +++ b/dev-docs/img/smoothedgrown_3.png diff --git a/docs/img/smoothedgrown_4.png b/dev-docs/img/smoothedgrown_4.png Binary files differindex d52a34bfe..d52a34bfe 100644 --- a/docs/img/smoothedgrown_4.png +++ b/dev-docs/img/smoothedgrown_4.png diff --git a/docs/img/smoothedgrown_5.png b/dev-docs/img/smoothedgrown_5.png Binary files differindex ae14d9847..ae14d9847 100644 --- a/docs/img/smoothedgrown_5.png +++ b/dev-docs/img/smoothedgrown_5.png diff --git a/docs/img/smoothedgrown_6.png b/dev-docs/img/smoothedgrown_6.png Binary files differindex 0a7f17595..0a7f17595 100644 --- a/docs/img/smoothedgrown_6.png +++ b/dev-docs/img/smoothedgrown_6.png diff --git a/docs/img/smoothedgrown_7.png b/dev-docs/img/smoothedgrown_7.png Binary files differindex 4351d6881..4351d6881 100644 --- a/docs/img/smoothedgrown_7.png +++ b/dev-docs/img/smoothedgrown_7.png diff --git a/docs/img/temperaturehumiditydecisionhills.jpg b/dev-docs/img/temperaturehumiditydecisionhills.jpg Binary files differindex c755df158..c755df158 100644 --- a/docs/img/temperaturehumiditydecisionhills.jpg +++ b/dev-docs/img/temperaturehumiditydecisionhills.jpg diff --git a/docs/img/temperaturehumiditydecisionsimple.jpg b/dev-docs/img/temperaturehumiditydecisionsimple.jpg Binary files differindex cbb1271b5..cbb1271b5 100644 --- a/docs/img/temperaturehumiditydecisionsimple.jpg +++ b/dev-docs/img/temperaturehumiditydecisionsimple.jpg diff --git a/docs/img/terraincomposition.jpg b/dev-docs/img/terraincomposition.jpg Binary files differindex 3d03e101d..3d03e101d 100644 --- a/docs/img/terraincomposition.jpg +++ b/dev-docs/img/terraincomposition.jpg diff --git a/docs/img/terrainheight.jpg b/dev-docs/img/terrainheight.jpg Binary files differindex bcbafcfaf..bcbafcfaf 100644 --- a/docs/img/terrainheight.jpg +++ b/dev-docs/img/terrainheight.jpg diff --git a/docs/img/twolevelbiomes.png b/dev-docs/img/twolevelbiomes.png Binary files differindex a3104733f..a3104733f 100644 --- a/docs/img/twolevelbiomes.png +++ b/dev-docs/img/twolevelbiomes.png diff --git a/docs/img/twolevellargeareas.jpg b/dev-docs/img/twolevellargeareas.jpg Binary files differindex 9d5d5ac8a..9d5d5ac8a 100644 --- a/docs/img/twolevellargeareas.jpg +++ b/dev-docs/img/twolevellargeareas.jpg diff --git a/docs/img/twolevelsmallareas.jpg b/dev-docs/img/twolevelsmallareas.jpg Binary files differindex 14afbc42a..14afbc42a 100644 --- a/docs/img/twolevelsmallareas.jpg +++ b/dev-docs/img/twolevelsmallareas.jpg diff --git a/docs/img/twolevelsmallgrid.jpg b/dev-docs/img/twolevelsmallgrid.jpg Binary files differindex 6c75e0b28..6c75e0b28 100644 --- a/docs/img/twolevelsmallgrid.jpg +++ b/dev-docs/img/twolevelsmallgrid.jpg diff --git a/docs/img/vanilla_springs_huge.png b/dev-docs/img/vanilla_springs_huge.png Binary files differindex 694389c85..694389c85 100644 --- a/docs/img/vanilla_springs_huge.png +++ b/dev-docs/img/vanilla_springs_huge.png diff --git a/docs/img/voronoi.png b/dev-docs/img/voronoi.png Binary files differindex e61e183ef..e61e183ef 100644 --- a/docs/img/voronoi.png +++ b/dev-docs/img/voronoi.png diff --git a/docs/img/voronoijitterbiomes.png b/dev-docs/img/voronoijitterbiomes.png Binary files differindex 42f0b7e40..42f0b7e40 100644 --- a/docs/img/voronoijitterbiomes.png +++ b/dev-docs/img/voronoijitterbiomes.png diff --git a/docs/img/zoomedgrown_1.png b/dev-docs/img/zoomedgrown_1.png Binary files differindex c73326b0e..c73326b0e 100644 --- a/docs/img/zoomedgrown_1.png +++ b/dev-docs/img/zoomedgrown_1.png diff --git a/docs/img/zoomedgrown_2.png b/dev-docs/img/zoomedgrown_2.png Binary files differindex 45fa6427f..45fa6427f 100644 --- a/docs/img/zoomedgrown_2.png +++ b/dev-docs/img/zoomedgrown_2.png diff --git a/docs/img/zoomedgrown_3.png b/dev-docs/img/zoomedgrown_3.png Binary files differindex 3c9d89759..3c9d89759 100644 --- a/docs/img/zoomedgrown_3.png +++ b/dev-docs/img/zoomedgrown_3.png diff --git a/docs/img/zoomedgrown_4.png b/dev-docs/img/zoomedgrown_4.png Binary files differindex 221a5fc76..221a5fc76 100644 --- a/docs/img/zoomedgrown_4.png +++ b/dev-docs/img/zoomedgrown_4.png diff --git a/docs/img/zoomedgrown_5.png b/dev-docs/img/zoomedgrown_5.png Binary files differindex 3881532ca..3881532ca 100644 --- a/docs/img/zoomedgrown_5.png +++ b/dev-docs/img/zoomedgrown_5.png diff --git a/docs/img/zoomedgrown_6.png b/dev-docs/img/zoomedgrown_6.png Binary files differindex cc03d2150..cc03d2150 100644 --- a/docs/img/zoomedgrown_6.png +++ b/dev-docs/img/zoomedgrown_6.png diff --git a/docs/img/zoomedgrown_7.png b/dev-docs/img/zoomedgrown_7.png Binary files differindex 7a9f43aac..7a9f43aac 100644 --- a/docs/img/zoomedgrown_7.png +++ b/dev-docs/img/zoomedgrown_7.png diff --git a/docs/js/ValueMap.js b/dev-docs/js/ValueMap.js index 31ddba27e..31ddba27e 100644 --- a/docs/js/ValueMap.js +++ b/dev-docs/js/ValueMap.js diff --git a/docs/js/grown.js b/dev-docs/js/grown.js index 1658ce21c..1658ce21c 100644 --- a/docs/js/grown.js +++ b/dev-docs/js/grown.js diff --git a/docs/style.css b/dev-docs/style.css index 74419d8da..74419d8da 100644 --- a/docs/style.css +++ b/dev-docs/style.css diff --git a/src/Bindings/LuaFunctions.h b/src/Bindings/LuaFunctions.h index be2669012..b17d7d497 100644 --- a/src/Bindings/LuaFunctions.h +++ b/src/Bindings/LuaFunctions.h @@ -1,6 +1,5 @@ #pragma once -#include "Logger.h" #include <time.h> // tolua_begin diff --git a/src/BlockInServerPluginInterface.h b/src/BlockInServerPluginInterface.h index d4759ce83..b3a71577f 100644 --- a/src/BlockInServerPluginInterface.h +++ b/src/BlockInServerPluginInterface.h @@ -10,12 +10,10 @@ #pragma once #include "Blocks/BlockPluginInterface.h" -#include "World.h" -#include "Root.h" #include "Bindings/PluginManager.h" - +class cWorld; class cBlockInServerPluginInterface : diff --git a/src/Blocks/BlockAnvil.h b/src/Blocks/BlockAnvil.h index ef3894b50..5b1fea134 100644 --- a/src/Blocks/BlockAnvil.h +++ b/src/Blocks/BlockAnvil.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "../Entities/Player.h" #include "../UI/AnvilWindow.h" diff --git a/src/Blocks/BlockBed.h b/src/Blocks/BlockBed.h index 9500dae9b..f2cbfde18 100644 --- a/src/Blocks/BlockBed.h +++ b/src/Blocks/BlockBed.h @@ -4,13 +4,11 @@ #pragma once #include "BlockEntity.h" -#include "BlockHandler.h" #include "MetaRotator.h" #include "ChunkInterface.h" -#include "../World.h" -#include "../Entities/Entity.h" +class cEntity; class cPlayer; class cWorldInterface; diff --git a/src/Blocks/BlockBrewingStand.h b/src/Blocks/BlockBrewingStand.h index 0ab5c8eba..3445a0f5a 100644 --- a/src/Blocks/BlockBrewingStand.h +++ b/src/Blocks/BlockBrewingStand.h @@ -2,7 +2,6 @@ #pragma once #include "BlockEntity.h" -#include "BlockHandler.h" #include "MetaRotator.h" diff --git a/src/Blocks/BlockFlowerPot.h b/src/Blocks/BlockFlowerPot.h index cafe476d9..40bad534f 100644 --- a/src/Blocks/BlockFlowerPot.h +++ b/src/Blocks/BlockFlowerPot.h @@ -1,7 +1,6 @@ #pragma once -#include "BlockHandler.h" #include "BlockEntity.h" diff --git a/src/Blocks/BlockFurnace.h b/src/Blocks/BlockFurnace.h index 788001f0e..ea1779c41 100644 --- a/src/Blocks/BlockFurnace.h +++ b/src/Blocks/BlockFurnace.h @@ -2,7 +2,6 @@ #pragma once #include "BlockEntity.h" -#include "../World.h" #include "../Blocks/BlockPiston.h" #include "MetaRotator.h" diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h index aa6751b60..b36b95f37 100644 --- a/src/Blocks/BlockIce.h +++ b/src/Blocks/BlockIce.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" diff --git a/src/Blocks/BlockLadder.h b/src/Blocks/BlockLadder.h index ef6885f86..27fbed9af 100644 --- a/src/Blocks/BlockLadder.h +++ b/src/Blocks/BlockLadder.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "ClearMetaOnDrop.h" diff --git a/src/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h index 1f25ac49e..5cd147fb5 100644 --- a/src/Blocks/BlockLeaves.h +++ b/src/Blocks/BlockLeaves.h @@ -1,7 +1,6 @@ #pragma once #include "BlockHandler.h" #include "../FastRandom.h" -#include "../World.h" #include "../BlockArea.h" diff --git a/src/Blocks/BlockLilypad.h b/src/Blocks/BlockLilypad.h index 18a576017..398d2b64b 100644 --- a/src/Blocks/BlockLilypad.h +++ b/src/Blocks/BlockLilypad.h @@ -2,7 +2,7 @@ #pragma once #include "BlockHandler.h" -#include "Entities/Pickup.h" + diff --git a/src/Blocks/BlockMobSpawner.h b/src/Blocks/BlockMobSpawner.h index 1dcedd8a8..f36e2b6eb 100644 --- a/src/Blocks/BlockMobSpawner.h +++ b/src/Blocks/BlockMobSpawner.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "../Items/ItemHandler.h" diff --git a/src/Blocks/BlockNetherWart.h b/src/Blocks/BlockNetherWart.h index aa7144458..5732259db 100644 --- a/src/Blocks/BlockNetherWart.h +++ b/src/Blocks/BlockNetherWart.h @@ -3,7 +3,6 @@ #include "BlockPlant.h" #include "../FastRandom.h" -#include "../World.h" diff --git a/src/Blocks/BlockOre.h b/src/Blocks/BlockOre.h index 484338f40..0c72e39f9 100644 --- a/src/Blocks/BlockOre.h +++ b/src/Blocks/BlockOre.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" diff --git a/src/Blocks/BlockPortal.h b/src/Blocks/BlockPortal.h index 9beb58199..6cebcbd37 100644 --- a/src/Blocks/BlockPortal.h +++ b/src/Blocks/BlockPortal.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../Mobs/Monster.h" diff --git a/src/Blocks/BlockRail.h b/src/Blocks/BlockRail.h index 5d3c087e7..07483c9b3 100644 --- a/src/Blocks/BlockRail.h +++ b/src/Blocks/BlockRail.h @@ -1,8 +1,6 @@ #pragma once -#include "BlockEntity.h" - diff --git a/src/Blocks/BlockRedstone.h b/src/Blocks/BlockRedstone.h index 47c90bfd9..225f1cc75 100644 --- a/src/Blocks/BlockRedstone.h +++ b/src/Blocks/BlockRedstone.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "BlockSlab.h" diff --git a/src/Blocks/BlockRedstoneTorch.h b/src/Blocks/BlockRedstoneTorch.h index 21d005052..11a42bf9f 100644 --- a/src/Blocks/BlockRedstoneTorch.h +++ b/src/Blocks/BlockRedstoneTorch.h @@ -1,7 +1,6 @@ #pragma once -#include "BlockRedstone.h" #include "BlockTorch.h" diff --git a/src/Blocks/BlockSapling.h b/src/Blocks/BlockSapling.h index a356eda8f..4133c5b80 100644 --- a/src/Blocks/BlockSapling.h +++ b/src/Blocks/BlockSapling.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../World.h" #include "../FastRandom.h" diff --git a/src/Blocks/BlockSignPost.h b/src/Blocks/BlockSignPost.h index 51e034081..4af50ad5b 100644 --- a/src/Blocks/BlockSignPost.h +++ b/src/Blocks/BlockSignPost.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../Entities/Player.h" #include "Chunk.h" diff --git a/src/Blocks/BlockSlab.h b/src/Blocks/BlockSlab.h index 966aff4e2..a424ae073 100644 --- a/src/Blocks/BlockSlab.h +++ b/src/Blocks/BlockSlab.h @@ -10,7 +10,6 @@ #pragma once #include "BlockHandler.h" -#include "../Items/ItemHandler.h" #include "ChunkInterface.h" #include "../Entities/Player.h" diff --git a/src/Blocks/BlockStems.h b/src/Blocks/BlockStems.h index 388da5874..659df558f 100644 --- a/src/Blocks/BlockStems.h +++ b/src/Blocks/BlockStems.h @@ -2,7 +2,6 @@ #pragma once #include "BlockPlant.h" -#include "../World.h" diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h index e15327743..21dba0bed 100644 --- a/src/Blocks/BlockVine.h +++ b/src/Blocks/BlockVine.h @@ -1,8 +1,8 @@ #pragma once #include "BlockHandler.h" -#include "MetaRotator.h" -#include "Bindings/PluginManager.h" + + diff --git a/src/Blocks/BlockWallSign.h b/src/Blocks/BlockWallSign.h index b69944609..7166f8ecd 100644 --- a/src/Blocks/BlockWallSign.h +++ b/src/Blocks/BlockWallSign.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "../Entities/Player.h" #include "Chunk.h" diff --git a/src/Blocks/WorldInterface.h b/src/Blocks/WorldInterface.h index d471df6f1..d90a7d3d6 100644 --- a/src/Blocks/WorldInterface.h +++ b/src/Blocks/WorldInterface.h @@ -1,15 +1,17 @@ #pragma once -#include "BroadcastInterface.h" + #include "../Mobs/MonsterTypes.h" -class cItems; typedef cItemCallback<cBlockEntity> cBlockEntityCallback; +class cBroadcastInterface; +class cItems; +class cPlayer; + -class cPlayer; class cWorldInterface diff --git a/src/Chunk.h b/src/Chunk.h index ff626d094..87f2cd568 100644 --- a/src/Chunk.h +++ b/src/Chunk.h @@ -8,8 +8,6 @@ #include "Simulator/SandSimulator.h" #include "Simulator/RedstoneSimulator.h" -#include "Blocks/GetHandlerCompileTimeTemplate.h" - #include "ChunkMap.h" diff --git a/src/ClientHandle.h b/src/ClientHandle.h index c68dd6119..b298751fe 100644 --- a/src/ClientHandle.h +++ b/src/ClientHandle.h @@ -11,10 +11,7 @@ #include "OSSupport/Network.h" #include "Defines.h" -#include "ByteBuffer.h" #include "Scoreboard.h" -#include "Map.h" -#include "Enchantments.h" #include "UI/SlotArea.h" #include "json/json.h" #include "ChunkSender.h" @@ -36,6 +33,7 @@ class cWindow; class cFallingBlock; class cCompositeChat; class cStatManager; +class cMap; class cClientHandle; typedef std::shared_ptr<cClientHandle> cClientHandlePtr; diff --git a/src/Cuboid.cpp b/src/Cuboid.cpp index 1aa1e92e1..ac9537a8b 100644 --- a/src/Cuboid.cpp +++ b/src/Cuboid.cpp @@ -7,20 +7,6 @@ -/** Returns true if the two specified intervals have a non-empty union */ -static bool DoIntervalsIntersect(int a_Min1, int a_Max1, int a_Min2, int a_Max2) -{ - return ( - ((a_Min1 >= a_Min2) && (a_Min1 <= a_Max2)) || // Start of first interval is within the second interval - ((a_Max1 >= a_Min2) && (a_Max1 <= a_Max2)) || // End of first interval is within the second interval - ((a_Min2 >= a_Min1) && (a_Min2 <= a_Max1)) // Start of second interval is within the first interval - ); -} - - - - - //////////////////////////////////////////////////////////////////////////////// // cCuboid: @@ -95,23 +81,6 @@ int cCuboid::GetVolume(void) const -bool cCuboid::DoesIntersect(const cCuboid & a_Other) const -{ - ASSERT(IsSorted()); - ASSERT(a_Other.IsSorted()); - - // In order for cuboids to intersect, each of their coord intervals need to intersect - return ( - DoIntervalsIntersect(p1.x, p2.x, a_Other.p1.x, a_Other.p2.x) && - DoIntervalsIntersect(p1.y, p2.y, a_Other.p1.y, a_Other.p2.y) && - DoIntervalsIntersect(p1.z, p2.z, a_Other.p1.z, a_Other.p2.z) - ); -} - - - - - bool cCuboid::IsCompletelyInside(const cCuboid & a_Outer) const { ASSERT(IsSorted()); diff --git a/src/Cuboid.h b/src/Cuboid.h index 3ade5bc20..ae4fed538 100644 --- a/src/Cuboid.h +++ b/src/Cuboid.h @@ -40,7 +40,18 @@ public: /** Returns true if the cuboids have at least one voxel in common. Both coords are considered inclusive. Assumes both cuboids are sorted. */ - bool DoesIntersect(const cCuboid & a_Other) const; + inline bool DoesIntersect(const cCuboid & a_Other) const + { + ASSERT(IsSorted()); + ASSERT(a_Other.IsSorted()); + + // In order for cuboids to intersect, each of their coord intervals need to intersect + return ( + DoIntervalsIntersect(p1.x, p2.x, a_Other.p1.x, a_Other.p2.x) && + DoIntervalsIntersect(p1.y, p2.y, a_Other.p1.y, a_Other.p2.y) && + DoIntervalsIntersect(p1.z, p2.z, a_Other.p1.z, a_Other.p2.z) + ); + } bool IsInside(const Vector3i & v) const { @@ -95,6 +106,17 @@ public: /** If needed, expands the cuboid so that it contains the specified point. Assumes sorted. Doesn't contract. */ void Engulf(const Vector3i & a_Point); + +private: + + /** Returns true if the two specified intervals have a non-empty union */ + inline static bool DoIntervalsIntersect(int a_Min1, int a_Max1, int a_Min2, int a_Max2) + { + ASSERT(a_Min1 <= a_Max1); + ASSERT(a_Min2 <= a_Max2); + return ((a_Min1 <= a_Max2) && (a_Max1 >= a_Min2)); + } + } ; // tolua_end diff --git a/src/Entities/SplashPotionEntity.h b/src/Entities/SplashPotionEntity.h index 85aa5046f..baa5da725 100644 --- a/src/Entities/SplashPotionEntity.h +++ b/src/Entities/SplashPotionEntity.h @@ -12,10 +12,12 @@ #include "ProjectileEntity.h" #include "EntityEffect.h" #include "../World.h" -#include "Entity.h" +class cEntity; + + // tolua_begin diff --git a/src/Generating/PieceGeneratorBFSTree.h b/src/Generating/PieceGeneratorBFSTree.h index 5efb8a1f4..33d2e5350 100644 --- a/src/Generating/PieceGeneratorBFSTree.h +++ b/src/Generating/PieceGeneratorBFSTree.h @@ -9,7 +9,6 @@ #pragma once -#include "ComposableGenerator.h" #include "PiecePool.h" #include "../Noise/Noise.h" diff --git a/src/Generating/PieceStructuresGen.h b/src/Generating/PieceStructuresGen.h index e3bd1bb59..1a75c90a6 100644 --- a/src/Generating/PieceStructuresGen.h +++ b/src/Generating/PieceStructuresGen.h @@ -16,7 +16,6 @@ cPieceGenerator instance. #include "ComposableGenerator.h" #include "PrefabPiecePool.h" -#include "GridStructGen.h" diff --git a/src/HTTP/HTTPMessage.h b/src/HTTP/HTTPMessage.h index 659fd5331..55e44fa93 100644 --- a/src/HTTP/HTTPMessage.h +++ b/src/HTTP/HTTPMessage.h @@ -9,7 +9,6 @@ #pragma once -#include "EnvelopeParser.h" diff --git a/src/HTTP/HTTPServer.h b/src/HTTP/HTTPServer.h index c8e7063fd..cd944bb89 100644 --- a/src/HTTP/HTTPServer.h +++ b/src/HTTP/HTTPServer.h @@ -11,7 +11,6 @@ #include "../OSSupport/Network.h" #include "../IniFile.h" -#include "PolarSSL++/RsaPrivateKey.h" #include "PolarSSL++/CryptoKey.h" #include "PolarSSL++/X509Cert.h" diff --git a/src/Items/ItemAxe.h b/src/Items/ItemAxe.h index 656497199..1f9c44f1e 100644 --- a/src/Items/ItemAxe.h +++ b/src/Items/ItemAxe.h @@ -2,8 +2,6 @@ #pragma once #include "ItemHandler.h" -#include "../World.h" -#include "../Entities/Player.h" diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h index 18b7bb46f..2c93c3856 100644 --- a/src/Items/ItemBucket.h +++ b/src/Items/ItemBucket.h @@ -6,7 +6,6 @@ #include "../Simulator/FluidSimulator.h" #include "../Blocks/BlockHandler.h" #include "../LineBlockTracer.h" -#include "../BlockInServerPluginInterface.h" #include "../Blocks/ChunkInterface.h" diff --git a/src/Items/ItemEmptyMap.h b/src/Items/ItemEmptyMap.h index 78d037313..3d77250fa 100644 --- a/src/Items/ItemEmptyMap.h +++ b/src/Items/ItemEmptyMap.h @@ -7,7 +7,6 @@ #pragma once -#include "../Entities/Entity.h" #include "../Item.h" diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h index 2becc16b0..a32368304 100644 --- a/src/Items/ItemFishingRod.h +++ b/src/Items/ItemFishingRod.h @@ -9,7 +9,6 @@ #pragma once -#include "../Bindings/PluginManager.h" #include "../Entities/Floater.h" #include "../Entities/Entity.h" #include "../Item.h" diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h index 9689ec50d..faee5d008 100644 --- a/src/Items/ItemHandler.h +++ b/src/Items/ItemHandler.h @@ -3,8 +3,6 @@ #include "../Defines.h" #include "../Item.h" -#include "../Entities/EntityEffect.h" -#include "../Blocks/BlockPluginInterface.h" @@ -13,6 +11,7 @@ // fwd: class cWorld; class cPlayer; +class cBlockPluginInterface; diff --git a/src/Items/ItemLighter.h b/src/Items/ItemLighter.h index 72e358297..1cf2ec939 100644 --- a/src/Items/ItemLighter.h +++ b/src/Items/ItemLighter.h @@ -4,7 +4,6 @@ #include "ItemHandler.h" #include "../World.h" #include "../Entities/Player.h" -#include "../Entities/TNTEntity.h" diff --git a/src/Items/ItemMap.h b/src/Items/ItemMap.h index afce4ba01..57ede063c 100644 --- a/src/Items/ItemMap.h +++ b/src/Items/ItemMap.h @@ -7,7 +7,6 @@ #pragma once -#include "../Entities/Entity.h" #include "../Item.h" diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h index 5c460421d..66796012b 100644 --- a/src/Items/ItemPickaxe.h +++ b/src/Items/ItemPickaxe.h @@ -2,8 +2,8 @@ #pragma once #include "ItemHandler.h" -#include "../World.h" -#include "../Entities/Player.h" + + class cItemPickaxeHandler : public cItemHandler diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h index 01c011fa3..dfc8aa033 100644 --- a/src/Items/ItemPotion.h +++ b/src/Items/ItemPotion.h @@ -2,7 +2,7 @@ #pragma once #include "../Entities/EntityEffect.h" -#include "../Entities/SplashPotionEntity.h" + class cItemPotionHandler: public cItemHandler diff --git a/src/Items/ItemShovel.h b/src/Items/ItemShovel.h index b26522b33..a3ef97684 100644 --- a/src/Items/ItemShovel.h +++ b/src/Items/ItemShovel.h @@ -5,7 +5,7 @@ #include "../World.h" #include "../Entities/Player.h" -#include "../Blocks/BlockHandler.h" + #include "../BlockInServerPluginInterface.h" diff --git a/src/Items/ItemSlab.h b/src/Items/ItemSlab.h index 7741f5f30..05bd60423 100644 --- a/src/Items/ItemSlab.h +++ b/src/Items/ItemSlab.h @@ -10,7 +10,6 @@ #pragma once #include "ItemHandler.h" -#include "../Blocks/BlockSlab.h" diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h index 46c88b49d..5730691cf 100644 --- a/src/Items/ItemSword.h +++ b/src/Items/ItemSword.h @@ -2,8 +2,6 @@ #pragma once #include "ItemHandler.h" -#include "../World.h" -#include "../Entities/Player.h" diff --git a/src/MobSpawner.h b/src/MobSpawner.h index 941a04a17..4d38d9657 100644 --- a/src/MobSpawner.h +++ b/src/MobSpawner.h @@ -7,12 +7,6 @@ -// fwd: -class cChunk; - - - - /** This class is used to determine which monster can be spawned in which place it is essentially static (eg. Squids spawn in water, Zombies spawn in dark places) diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h index 1507598bb..d1630e4ff 100644 --- a/src/Mobs/Monster.h +++ b/src/Mobs/Monster.h @@ -2,13 +2,11 @@ #pragma once #include "../Entities/Pawn.h" -#include "../Defines.h" -#include "../Item.h" -#include "../Enchantments.h" #include "MonsterTypes.h" #include "PathFinder.h" +class cItem; class cClientHandle; diff --git a/src/Mobs/Ocelot.h b/src/Mobs/Ocelot.h index fbff991c7..5729851fe 100644 --- a/src/Mobs/Ocelot.h +++ b/src/Mobs/Ocelot.h @@ -2,7 +2,6 @@ #pragma once #include "PassiveMonster.h" -#include "../Entities/Entity.h" diff --git a/src/Mobs/Wolf.h b/src/Mobs/Wolf.h index 70e761469..e05fedbf8 100644 --- a/src/Mobs/Wolf.h +++ b/src/Mobs/Wolf.h @@ -2,9 +2,9 @@ #pragma once #include "PassiveAggressiveMonster.h" -#include "../Entities/Entity.h" +class cEntity; diff --git a/src/OSSupport/NetworkSingleton.h b/src/OSSupport/NetworkSingleton.h index cbcefc290..902c62550 100644 --- a/src/OSSupport/NetworkSingleton.h +++ b/src/OSSupport/NetworkSingleton.h @@ -14,7 +14,6 @@ #pragma once #include <event2/event.h> -#include "Network.h" #include "NetworkLookup.h" #include "CriticalSection.h" #include "Event.h" diff --git a/src/Protocol/Packetizer.h b/src/Protocol/Packetizer.h index efed9c7a9..26b3a7ec7 100644 --- a/src/Protocol/Packetizer.h +++ b/src/Protocol/Packetizer.h @@ -11,7 +11,10 @@ #pragma once #include "Protocol.h" -#include "../ByteBuffer.h" + + + +class cByteBuffer; diff --git a/src/Protocol/Protocol.h b/src/Protocol/Protocol.h index ee0be74c2..18ede0640 100644 --- a/src/Protocol/Protocol.h +++ b/src/Protocol/Protocol.h @@ -11,9 +11,7 @@ #pragma once #include "../Defines.h" -#include "../Endianness.h" #include "../Scoreboard.h" -#include "../Map.h" #include "../ByteBuffer.h" #include "../EffectID.h" @@ -21,6 +19,7 @@ +class cMap; class cExpOrb; class cPlayer; class cEntity; diff --git a/src/Simulator/FireSimulator.h b/src/Simulator/FireSimulator.h index 204306f61..5c926e6ea 100644 --- a/src/Simulator/FireSimulator.h +++ b/src/Simulator/FireSimulator.h @@ -2,7 +2,6 @@ #pragma once #include "Simulator.h" -#include "../BlockEntities/BlockEntity.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneLampHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneLampHandler.h index 5d9cd241b..f28f75f4b 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneLampHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneLampHandler.h @@ -1,7 +1,6 @@ #pragma once -#include "IncrementalRedstoneSimulator.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h index 253b502fe..40e7da96a 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h @@ -2,8 +2,6 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockButton.h" -#include "Blocks/BlockLever.h" diff --git a/src/UI/SlotArea.h b/src/UI/SlotArea.h index 5a94a26af..be21cdada 100644 --- a/src/UI/SlotArea.h +++ b/src/UI/SlotArea.h @@ -9,7 +9,8 @@ #pragma once #include "../Inventory.h" -#include "Window.h" + + diff --git a/src/WorldStorage/FireworksSerializer.h b/src/WorldStorage/FireworksSerializer.h index 59f1b09b0..9a24edadd 100644 --- a/src/WorldStorage/FireworksSerializer.h +++ b/src/WorldStorage/FireworksSerializer.h @@ -9,7 +9,6 @@ #pragma once -#include "Defines.h" class cFastNBTWriter; class cParsedNBT; diff --git a/src/WorldStorage/WSSAnvil.h b/src/WorldStorage/WSSAnvil.h index 37ccdda4c..454e6f73d 100755 --- a/src/WorldStorage/WSSAnvil.h +++ b/src/WorldStorage/WSSAnvil.h @@ -10,7 +10,6 @@ #include "WorldStorage.h" #include "FastNBT.h" -#include "../Mobs/Monster.h" @@ -18,7 +17,7 @@ // fwd: ItemGrid.h class cItemGrid; - +class cMonster; class cProjectileEntity; class cHangingEntity; |