diff options
Diffstat (limited to 'src')
59 files changed, 52 insertions, 114 deletions
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; |