resturcture includes

FactoryCraft/BasicBlocks.cpp

@@ -1,11 +1,10 @@
 #include "BasicBlocks.h"
 
+#include "BlockType.h"
 #include "Game.h"
-#include "ItemEntity.h"
 #include "ItemSlot.h"
-#include "ItemStack.h"
+#include "ItemType.h"
 #include "ModelInfo.h"
-#include "TreeSeblingBlock.h"
 
 BasicBlock::BasicBlock(int typeId, Framework::Vec3<int> pos, int dimensionId)
     : BasicBlock(typeId, pos, dimensionId, false)

FactoryCraft/BasicItems.cpp

@@ -1,9 +1,7 @@
 #include "BasicItems.h"
 
 #include "Entity.h"
-#include "Game.h"
 #include "Item.h"
-#include "ModelInfo.h"
 
 BasicItemType::BasicItemType()
     : ItemType(),

FactoryCraft/BasicTool.cpp

@@ -1,7 +1,5 @@
 #include "BasicTool.h"
 
-#include <numeric>
-
 #include "Block.h"
 #include "Dimension.h"
 #include "Entity.h"

FactoryCraft/BasicTool.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "BasicItems.h"
 #include "BlockFilter.h"
 #include "Item.h"
 #include "ItemSkill.h"
+#include "ItemType.h"
 
 class BasicToolItemType;
 

FactoryCraft/Block.cpp

@@ -4,9 +4,8 @@
 #include "Game.h"
 #include "InteractionConfig.h"
 #include "Inventory.h"
-#include "ItemEntity.h"
+#include "ItemType.h"
 #include "MultiblockStructure.h"
-#include "NoBlock.h"
 #include "PlaceableProof.h"
 #include "TickQueue.h"
 #include "WorldGenerator.h"

FactoryCraft/Block.h

@@ -1,15 +1,12 @@
 #pragma once
 
-#include <Either.h>
-#include <Trie.h>
 #include <Vec3.h>
-#include <VecN.h>
 
 #include "Inventory.h"
 #include "Item.h"
+#include "ItemType.h"
 #include "MultiblockStructure.h"
 #include "NetworkMessage.h"
-#include "ReferenceCounter.h"
 #include "Tickable.h"
 #include "TickSourceType.h"
 

FactoryCraft/BlockInstanceGeneratorRule.cpp

@@ -1,5 +1,6 @@
 #include "BlockInstanceGeneratorRule.h"
 
+#include "BlockType.h"
 #include "Game.h"
 
 BlockInstanceGeneratorRule::BlockInstanceGeneratorRule()

FactoryCraft/BlockType.cpp

@@ -1,10 +1,8 @@
 #include "BlockType.h"
 
-#include "BasicBlocks.h"
 #include "Block.h"
 #include "Dimension.h"
 #include "Game.h"
-#include "ItemType.h"
 #include "MultiblockStructure.h"
 
 using namespace Framework;

FactoryCraft/BlockTypeGeneratorRule.cpp

@@ -1,5 +1,6 @@
 #include "BlockTypeGeneratorRule.h"
 
+#include "BlockType.h"
 #include "Game.h"
 
 BlockTypeGeneratorRule::BlockTypeGeneratorRule()

FactoryCraft/ChatCommand.cpp

@@ -1,7 +1,5 @@
 #include "ChatCommand.h"
 
-#include <AsynchronCall.h>
-
 #include "Game.h"
 #include "Player.h"
 

FactoryCraft/Chest.cpp

@@ -1,14 +1,9 @@
 #include "Chest.h"
 
-#include <TextFeld.h>
-
 #include "Chunk.h"
 #include "Dimension.h"
 #include "Entity.h"
 #include "Game.h"
-#include "ItemSlot.h"
-#include "UIController.h"
-#include "UIDialog.h"
 
 Chest::Chest(int typeId, Framework::Vec3<int> pos, int dimensionId)
     : BasicBlock(typeId, pos, dimensionId, 1),

FactoryCraft/Chunk.cpp

@@ -3,6 +3,7 @@
 #include <InMemoryBuffer.h>
 #include <Logging.h>
 
+#include "BlockType.h"
 #include "Constants.h"
 #include "Dimension.h"
 #include "Entity.h"

FactoryCraft/ChunkMap.cpp

@@ -2,7 +2,6 @@
 
 #include "Chunk.h"
 #include "Constants.h"
-#include "Game.h"
 
 ChunkMap::ChunkMap(Framework::Punkt chunkCenter)
     : ReferenceCounter(),

FactoryCraft/CraftingStorage.cpp

@@ -5,6 +5,7 @@
 #include "Game.h"
 #include "Inventory.h"
 #include "Item.h"
+#include "ItemType.h"
 #include "RecipieList.h"
 #include "RecipieLoader.h"
 

FactoryCraft/CraftingStorage.h

@@ -3,7 +3,6 @@
 #include <Vec3.h>
 
 #include "Inventory.h"
-#include "ItemFilter.h"
 #include "ItemSlot.h"
 #include "ItemStack.h"
 #include "Recipie.h"

FactoryCraft/DefaultBlockItemDrop.cpp

@@ -1,6 +1,7 @@
 #include "DefaultBlockItemDrop.h"
 
 #include "Block.h"
+#include "BlockType.h"
 
 DefaultBlockItemDrop::DefaultBlockItemDrop()
     : DropConfig()

FactoryCraft/Effect.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include <Text.h>
-
-class Entity;
-class EffectFactory;
-
-class Effect : public virtual Framework::ReferenceCounter
-{
-private:
-	Framework::Text name;
-	float duration;
-
-	Effect(Entity* zTarget);
-
-public:
-	~Effect();
-
-	virtual void tick();
-
-	Framework::Text getName() const;
-	float getDuration() const;
-
-	friend EffectFactory;
-};

FactoryCraft/EffectFactory.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Effect.h"
-
-class EffectFactory : public virtual Framework::ReferenceCounter
-{
-private:
-	Framework::Text effectName;
-
-public:
-	EffectFactory(Framework::Text effectName);
-
-	virtual Effect* createEffectOn(Entity* target) = 0;
-};

FactoryCraft/Entity.cpp

@@ -8,6 +8,7 @@
 #include "Game.h"
 #include "ItemSkill.h"
 #include "ItemStack.h"
+#include "ItemType.h"
 
 ActionTarget::ActionTarget(Framework::Vec3<int> blockPos, Direction blockSide)
     : blockPos(blockPos),

FactoryCraft/Entity.h

@@ -144,6 +144,5 @@ public:
     void setLastSavedChunkCenter(Framework::Punkt pos);
     void setRemoved();
 
-    friend Effect;
     friend EntityType;
 };

FactoryCraft/FactoryCraft.vcxproj

@@ -139,8 +139,6 @@
     <ClInclude Include="CraftingStorage.h" />
     <ClInclude Include="DimensionGenerator.h" />
     <ClInclude Include="DoLaterHandler.h" />
-    <ClInclude Include="Effect.h" />
-    <ClInclude Include="EffectFactory.h" />
     <ClInclude Include="Entity.h" />
     <ClInclude Include="EntityType.h" />
     <ClInclude Include="FastNoiseLite.h" />

FactoryCraft/FactoryCraft.vcxproj.filters

@@ -7,9 +7,6 @@
     <Filter Include="game">
       <UniqueIdentifier>{26d8996d-452d-4c1f-b52b-82310b4ee42f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="effects">
-      <UniqueIdentifier>{d758dbfd-2172-4c68-bc59-b39c289c28df}</UniqueIdentifier>
-    </Filter>
     <Filter Include="entities">
       <UniqueIdentifier>{56ad694e-70aa-4ef4-b698-7ff7755b3e60}</UniqueIdentifier>
     </Filter>
@@ -165,12 +162,6 @@
     <ClInclude Include="ItemSlot.h">
       <Filter>inventory</Filter>
     </ClInclude>
-    <ClInclude Include="Effect.h">
-      <Filter>effects</Filter>
-    </ClInclude>
-    <ClInclude Include="EffectFactory.h">
-      <Filter>effects</Filter>
-    </ClInclude>
     <ClInclude Include="ItemSkill.h">
       <Filter>inventory</Filter>
     </ClInclude>

FactoryCraft/FluidBlock.cpp

@@ -2,6 +2,7 @@
 
 #include <Logging.h>
 
+#include "BlockType.h"
 #include "Dimension.h"
 #include "FluidContainer.h"
 #include "Game.h"

FactoryCraft/FluidContainer.cpp

@@ -1,8 +1,8 @@
 #include "FluidContainer.h"
 
 #include <Logging.h>
-#include <TextFeld.h>
 
+#include "BlockType.h"
 #include "Dimension.h"
 #include "Entity.h"
 #include "FluidBlock.h"

FactoryCraft/FluidContainer.h

@@ -5,6 +5,7 @@
 #include "BlockFilter.h"
 #include "Item.h"
 #include "ItemSkill.h"
+#include "ItemType.h"
 
 class FluidContainerItemType;
 

FactoryCraft/Game.cpp

@@ -1,5 +1,6 @@
 #include "Game.h"
 
+#include <Datei.h>
 #include <Logging.h>
 
 #include "Chat.h"

FactoryCraft/GameClient.cpp

@@ -5,6 +5,7 @@
 #include "Constants.h"
 #include "Dimension.h"
 #include "Game.h"
+#include "ItemType.h"
 #include "Player.h"
 #include "Server.h"
 

FactoryCraft/GeneratedStructure.cpp

@@ -1,9 +1,8 @@
 #include "GeneratedStructure.h"
 
+#include "Game.h"
 #include "GeneratorTemplate.h"
 #include "MultiblockStructure.h"
-#include "NoBlock.h"
-#include "Game.h"
 
 using namespace Framework;
 

FactoryCraft/Grass.cpp

@@ -1,8 +1,5 @@
 #include "Grass.h"
 
-#include "Game.h"
-#include "ItemEntity.h"
-
 GrassBlock::GrassBlock(int typeId, Framework::Vec3<int> pos, int dimensionId)
     : BasicBlock(typeId, pos, dimensionId)
 {

FactoryCraft/GrowingPlant.cpp

@@ -2,7 +2,6 @@
 
 #include "Dimension.h"
 #include "Game.h"
-#include "Recipie.h"
 
 GrowthState::GrowthState(float percentage, ModelInfo* model)
     : ReferenceCounter(),

FactoryCraft/GrowingPlant.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Block.h"
+#include "BlockType.h"
 
 class GrowingPlantBlockType;
 

FactoryCraft/Inventory.cpp

@@ -9,6 +9,7 @@
 #include "ItemFilter.h"
 #include "ItemSlot.h"
 #include "ItemStack.h"
+#include "ItemType.h"
 #include "NetworkMessage.h"
 
 using namespace Framework;

FactoryCraft/Inventory.h

@@ -2,7 +2,6 @@
 
 #include <Critical.h>
 #include <HashMap.h>
-#include <ImmutablePair.h>
 #include <ReferenceCounter.h>
 #include <Vec3.h>
 #include <Writer.h>

FactoryCraft/Item.h

@@ -1,12 +1,13 @@
 #pragma once
 
-#include "ItemType.h"
-#include "Reader.h"
+#include <Vec3.h>
+
 #include "TypeRegistry.h"
 
 class ItemType;
 class BlockType;
 class StoneToolItemType;
+class Entity;
 
 class Item : public virtual Framework::ReferenceCounter
 {

FactoryCraft/ItemEntity.cpp

@@ -3,6 +3,7 @@
 #include "Game.h"
 #include "ItemSlot.h"
 #include "ItemStack.h"
+#include "ItemType.h"
 
 #ifdef _WINDOWS
 #    define __INT32_MAX__ 0x7FFFFFFF

FactoryCraft/ItemModifier.cpp

@@ -1,6 +1,7 @@
 #include "ItemModifier.h"
 
 #include "Game.h"
+#include "ItemType.h"
 
 using namespace Framework;
 

FactoryCraft/ItemSkill.cpp

@@ -2,7 +2,6 @@
 
 #include "Block.h"
 #include "Entity.h"
-#include "ItemType.h"
 
 ItemSkill::ItemSkill()
     : Framework::ReferenceCounter(),

FactoryCraft/ItemStack.cpp

@@ -1,6 +1,7 @@
 #include "ItemStack.h"
 
 #include "Item.h"
+#include "ItemType.h"
 
 ItemStack::ItemStack(Item* item, int currentSize, int maxSize)
     : ReferenceCounter(),
@@ -27,7 +28,7 @@ ItemStack* ItemStack::split(int size)
 {
     size = MIN(size, this->size);
     this->size -= size;
-    ItemStack *result = new ItemStack(
+    ItemStack* result = new ItemStack(
         dynamic_cast<Item*>(item->getThis()), size, item->getMaxStackSize());
     if (size == 0)
     {

FactoryCraft/ItemType.h

@@ -2,11 +2,9 @@
 
 #include <JSON.h>
 #include <Text.h>
-#include <Trie.h>
 #include <Writer.h>
 
 #include "BlockType.h"
-#include "Effect.h"
 #include "Game.h"
 #include "ModelInfo.h"
 

FactoryCraft/JsonExpression.cpp

@@ -1,7 +1,6 @@
 #include "JsonExpression.h"
 
-#include "Dimension.h"
-#include "DimensionGenerator.h"
+#include "Chunk.h"
 #include "Game.h"
 
 JExpressionMemory::JExpressionMemory()

FactoryCraft/JsonExpression.h

@@ -3,7 +3,6 @@
 #include <Array.h>
 #include <Assembly.h>
 #include <Critical.h>
-#include <functional>
 #include <JSON.h>
 #include <Text.h>
 #include <Trie.h>

FactoryCraft/LightSources.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BasicBlocks.h"
 #include "Block.h"
 #include "BlockType.h"
 

FactoryCraft/MultiblockStructure.h

@@ -9,8 +9,8 @@
 class MultiblockStructureType;
 class Entity;
 class Item;
-class Block;
 class ItemSkill;
+class Block;
 
 class MultiblockStructureEnum
 {

FactoryCraft/MultiblockStructureManager.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Text.h>
 #include <Trie.h>
 
 #include "MultiblockStructure.h"

FactoryCraft/Player.cpp

@@ -6,6 +6,7 @@
 #include "Game.h"
 #include "ItemFilter.h"
 #include "ItemStack.h"
+#include "ItemType.h"
 #include "QuestDialog.h"
 #include "UIController.h"
 

FactoryCraft/Quest.cpp

@@ -1,9 +1,7 @@
 #include "Quest.h"
 
 #include <Datei.h>
-#include <Fenster.h>
 #include <Logging.h>
-#include <TextFeld.h>
 
 #include "Game.h"
 
@@ -218,7 +216,7 @@ JSONObjectValidationBuilder* QuestStorageType::addToValidator(
         ->finishBool()
         ->withRequiredArray("requirements")
         ->addAcceptedTypeInArray(Game::INSTANCE->zTypeRegistry()
-                                     ->getValidator<QuestRequirementStorage>())
+                ->getValidator<QuestRequirementStorage>())
         ->finishArray()
         ->withRequiredObject("data")
         ->allowAdditionalAttriutes()
@@ -709,8 +707,7 @@ void QuestManager::loadQuests()
         Framework::Logging::info() << "loading quests ...";
         Framework::Validator::DataValidator* validator
             = Framework::Validator::DataValidator::buildForArray()
-                  ->addAcceptedTypeInArray(
-                      Game::INSTANCE->zTypeRegistry()
+                  ->addAcceptedTypeInArray(Game::INSTANCE->zTypeRegistry()
                           ->getValidator<QuestCollection>())
                   ->removeInvalidEntries()
                   ->finishArray();
@@ -755,7 +752,7 @@ void QuestManager::loadQuests()
         Framework::Validator::DataValidator* validator
             = Framework::Validator::DataValidator::buildForArray()
                   ->addAcceptedTypeInArray(Game::INSTANCE->zTypeRegistry()
-                                               ->getValidator<QuestParty>())
+                          ->getValidator<QuestParty>())
                   ->removeInvalidEntries()
                   ->finishArray();
         Framework::RCArray<Framework::Validator::ValidationResult>

FactoryCraft/RandNoise.cpp

@@ -1,12 +1,7 @@
 #include "RandNoise.h"
 
-#include <Random.h>
 #include <stdlib.h>
 
-#include "Constants.h"
-#include "FastNoiseLite.h"
-#include "FastNoiseWrapper.h"
-
 #ifndef RAND_MAX
 #    define RAND_MAX 0x7FFF
 #endif

FactoryCraft/RandNoise.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Noise.h"
-#include <Random.h>
 
 class FastNoiseWrapper;
 

FactoryCraft/Recipie.cpp

@@ -5,8 +5,7 @@
 #include "CraftingStorage.h"
 #include "Game.h"
 #include "Item.h"
-#include "RecipieGroupConfig.h"
-#include "UIElement.h"
+#include "ItemType.h"
 
 RecipieInput::RecipieInput()
     : ReferenceCounter(),

FactoryCraft/Recipie.h

@@ -2,6 +2,7 @@
 #include <Array.h>
 #include <JSON.h>
 
+#include "Game.h"
 #include "ItemFilter.h"
 #include "ItemModifier.h"
 #include "TypeRegistry.h"

FactoryCraft/RecipieLoader.cpp

@@ -6,7 +6,6 @@
 #include <stdexcept>
 
 #include "Game.h"
-#include "ItemType.h"
 #include "JsonUtils.h"
 
 using namespace Framework::JSON;

FactoryCraft/Server.cpp

@@ -5,6 +5,7 @@
 #include <iostream>
 #include <Logging.h>
 
+#include "Game.h"
 #include "PlayerRegister.h"
 
 // Inhalt der LoginServer Klasse aus LoginServer.h
@@ -63,7 +64,7 @@ FactoryCraftServer::FactoryCraftServer(InitDatei* zIni)
             klient->getNachricht((char*)&bg, 1);
             klient->setEmpfangTimeout(0);
             bool found = 0;
-            EnterCriticalSection(&cs);
+            cs.lock();
             for (FCKlient* client : *klients)
             {
                 if (client->matchAuthKey(key, len))
@@ -82,7 +83,7 @@ FactoryCraftServer::FactoryCraftServer(InitDatei* zIni)
                     break;
                 }
             }
-            LeaveCriticalSection(&cs);
+            cs.unlock();
             if (!found)
             {
                 klient->sende("\0", 1);
@@ -93,7 +94,6 @@ FactoryCraftServer::FactoryCraftServer(InitDatei* zIni)
         }
         runningThreads--;
     });
-    InitializeCriticalSection(&cs);
 }
 
 // Destruktor
@@ -107,7 +107,6 @@ FactoryCraftServer::~FactoryCraftServer()
     server->release();
     if (klients) klients->release();
     ini->release();
-    DeleteCriticalSection(&cs);
 }
 
 // nicht constant
@@ -121,9 +120,9 @@ void FactoryCraftServer::run()
         Framework::getThreadRegister()->cleanUpClosedThreads();
         FCKlient* clHandle = new FCKlient(
             klient, dynamic_cast<FactoryCraftServer*>(getThis()));
-        EnterCriticalSection(&cs);
+        cs.lock();
         klients->add(clHandle);
-        LeaveCriticalSection(&cs);
+        cs.unlock();
         clHandle->start();
     }
     runningThreads--;
@@ -134,17 +133,17 @@ void FactoryCraftServer::close()
     Game::INSTANCE->save();
     sslServer->trenne();
     server->trenne();
-    EnterCriticalSection(&cs);
+    cs.lock();
     for (int i = 0; i < klients->getEintragAnzahl(); i++)
         klients->z(i)->absturz();
-    LeaveCriticalSection(&cs);
+    cs.unlock();
 }
 
 bool FactoryCraftServer::removeKlient(FCKlient* zKlient)
 {
     bool gefunden = 0;
     getThis();
-    EnterCriticalSection(&cs);
+    cs.lock();
     for (int i = 0; i < klients->getEintragAnzahl(); i++)
     {
         if (klients->z(i) == zKlient)
@@ -154,7 +153,7 @@ bool FactoryCraftServer::removeKlient(FCKlient* zKlient)
             break;
         }
     }
-    LeaveCriticalSection(&cs);
+    cs.unlock();
     release();
     return gefunden;
 }

FactoryCraft/Server.h

@@ -1,17 +1,15 @@
 #pragma once
 
-#include <Datei.h>
 #include <InitDatei.h>
 #ifdef _WINDOWS
-#include <Network\Server.h>
+#    include <Network\Server.h>
 #else
-#include <Server.h>
+#    include <Server.h>
 #endif
+#include <Critical.h>
 #include <Text.h>
 #include <Thread.h>
 
-#include "Game.h"
-
 using namespace Framework;
 using namespace Network;
 
@@ -24,7 +22,7 @@ private:
     SSLServer* sslServer;
     Server* server;
     InitDatei* ini;
-    CRITICAL_SECTION cs;
+    Critical cs;
     RCArray<FCKlient>* klients;
     int runningThreads;
     int id;

FactoryCraft/StructureCollection.cpp

@@ -1,6 +1,5 @@
 #include "StructureCollection.h"
 
-#include "Constants.h"
 #include "Game.h"
 #include "JNoise.h"
 

FactoryCraft/StructureCollection.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <functional>
-
 #include "GeneratorTemplate.h"
 #include "JsonExpression.h"
 #include "Noise.h"

FactoryCraft/TickWorker.cpp

@@ -9,8 +9,6 @@
 #    define pid_t int
 #endif
 
-#include "Block.h"
-
 TickWorker::TickWorker(TickQueue* queue)
     : Thread(),
       queue(queue),

FactoryCraft/TreeSeblingBlock.cpp

@@ -1,9 +1,7 @@
 #include "TreeSeblingBlock.h"
 
-#include "BasicBlocks.h"
 #include "Dimension.h"
 #include "Game.h"
-#include "NoBlock.h"
 #include "RandNoise.h"
 #include "TreeTemplate.h"
 #include "WorldGenerator.h"
@@ -285,8 +283,7 @@ Framework::JSON::JSONObject* TreeSeblingBlockTypeFactory::toJsonObject(
 JSONObjectValidationBuilder* TreeSeblingBlockTypeFactory::addToValidator(
     JSONObjectValidationBuilder* builder) const
 {
-    return BlockTypeFactoryBase::addToValidator(
-        builder
+    return BlockTypeFactoryBase::addToValidator(builder
             ->withRequiredAttribute("itemType",
                 Game::INSTANCE->zTypeRegistry()->getValidator<Framework::Text>(
                     ItemTypeNameFactory::TYPE_ID))

FactoryCraft/TypeRegistry.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Array.h>
-#include <cstdlib>
 #include <DataValidator.h>
 #include <JSON.h>
 #include <Logging.h>

FactoryCraft/UIInventory.cpp

@@ -1,6 +1,5 @@
 #include "UIInventory.h"
 
-#include "UICraftingProgress.h"
 #include "UIReference.h"
 
 UIInventoryElement::UIInventoryElement()

FactoryCraft/WorldLoader.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Critical.h>
-#include <HashMap.h>
 #include <Thread.h>
 
 #include "Area.h"

Windows Version/Windows Version.vcxproj

@@ -330,8 +330,6 @@ copy ..\..\..\..\..\Allgemein\Framework\x64\release\Framework.dll Framework.dll<
     <ClInclude Include="..\FactoryCraft\CraftingStorage.h" />
     <ClInclude Include="..\FactoryCraft\DimensionGenerator.h" />
     <ClInclude Include="..\FactoryCraft\DoLaterHandler.h" />
-    <ClInclude Include="..\FactoryCraft\Effect.h" />
-    <ClInclude Include="..\FactoryCraft\EffectFactory.h" />
     <ClInclude Include="..\FactoryCraft\Entity.h" />
     <ClInclude Include="..\FactoryCraft\EntityType.h" />
     <ClInclude Include="..\FactoryCraft\FastNoiseLite.h" />

Windows Version/Windows Version.vcxproj.filters

@@ -7,9 +7,6 @@
     <Filter Include="game">
       <UniqueIdentifier>{26d8996d-452d-4c1f-b52b-82310b4ee42f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="effects">
-      <UniqueIdentifier>{d758dbfd-2172-4c68-bc59-b39c289c28df}</UniqueIdentifier>
-    </Filter>
     <Filter Include="entities">
       <UniqueIdentifier>{56ad694e-70aa-4ef4-b698-7ff7755b3e60}</UniqueIdentifier>
     </Filter>
@@ -539,12 +536,6 @@
     <ClInclude Include="..\FactoryCraft\ItemSlot.h">
       <Filter>inventory</Filter>
     </ClInclude>
-    <ClInclude Include="..\FactoryCraft\Effect.h">
-      <Filter>effects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\FactoryCraft\EffectFactory.h">
-      <Filter>effects</Filter>
-    </ClInclude>
     <ClInclude Include="..\FactoryCraft\ItemSkill.h">
       <Filter>inventory</Filter>
     </ClInclude>