From 9b0cb3fd97701370915a9a5b3d5b237fa7f90e06 Mon Sep 17 00:00:00 2001 From: archshift Date: Sun, 27 Apr 2014 17:03:06 -0700 Subject: [PATCH] Fixed projectile source filenames, indentations --- src/CMakeLists.txt | 16 ++++----- .../{ProjectileArrow.cpp => ArrowEntity.cpp} | 36 +++++++++---------- .../{ProjectileArrow.h => ArrowEntity.h} | 4 +-- ...ctileExpBottle.cpp => ExpBottleEntity.cpp} | 4 +-- ...rojectileExpBottle.h => ExpBottleEntity.h} | 4 +-- ...ileFireCharge.cpp => FireChargeEntity.cpp} | 4 +-- ...jectileFireCharge.h => FireChargeEntity.h} | 4 +-- ...jectileFirework.cpp => FireworkEntity.cpp} | 8 ++--- ...{ProjectileFirework.h => FireworkEntity.h} | 4 +-- ...stFireball.cpp => GhastFireballEntity.cpp} | 4 +-- ...eGhastFireball.h => GhastFireballEntity.h} | 4 +-- src/Entities/ProjectileEntity.cpp | 16 ++++----- ...{ProjectileEgg.cpp => ThrownEggEntity.cpp} | 4 +-- .../{ProjectileEgg.h => ThrownEggEntity.h} | 4 +-- ...erPearl.cpp => ThrownEnderPearlEntity.cpp} | 4 +-- ...eEnderPearl.h => ThrownEnderPearlEntity.h} | 4 +-- ...eSnowball.cpp => ThrownSnowballEntity.cpp} | 4 +-- ...ctileSnowball.h => ThrownSnowballEntity.h} | 4 +-- src/Items/ItemBow.h | 2 +- src/Mobs/Blaze.cpp | 2 +- src/Mobs/Ghast.cpp | 2 +- src/Mobs/Skeleton.cpp | 2 +- src/Protocol/Protocol125.cpp | 2 +- src/Protocol/Protocol17x.cpp | 4 +-- src/WorldStorage/NBTChunkSerializer.cpp | 2 +- src/WorldStorage/WSSAnvil.cpp | 12 +++---- 26 files changed, 80 insertions(+), 80 deletions(-) rename src/Entities/{ProjectileArrow.cpp => ArrowEntity.cpp} (89%) rename src/Entities/{ProjectileArrow.h => ArrowEntity.h} (98%) rename src/Entities/{ProjectileExpBottle.cpp => ExpBottleEntity.cpp} (87%) rename src/Entities/{ProjectileExpBottle.h => ExpBottleEntity.h} (89%) rename src/Entities/{ProjectileFireCharge.cpp => FireChargeEntity.cpp} (91%) rename src/Entities/{ProjectileFireCharge.h => FireChargeEntity.h} (92%) rename src/Entities/{ProjectileFirework.cpp => FireworkEntity.cpp} (90%) rename src/Entities/{ProjectileFirework.h => FireworkEntity.h} (92%) rename src/Entities/{ProjectileGhastFireball.cpp => GhastFireballEntity.cpp} (90%) rename src/Entities/{ProjectileGhastFireball.h => GhastFireballEntity.h} (92%) rename src/Entities/{ProjectileEgg.cpp => ThrownEggEntity.cpp} (93%) rename src/Entities/{ProjectileEgg.h => ThrownEggEntity.h} (93%) rename src/Entities/{ProjectileEnderPearl.cpp => ThrownEnderPearlEntity.cpp} (91%) rename src/Entities/{ProjectileEnderPearl.h => ThrownEnderPearlEntity.h} (92%) rename src/Entities/{ProjectileSnowball.cpp => ThrownSnowballEntity.cpp} (90%) rename src/Entities/{ProjectileSnowball.h => ThrownSnowballEntity.h} (91%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f433c29c..9fbaed926 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,14 +57,14 @@ if (NOT MSVC) Entities/Pickup.h Entities/Player.h Entities/ProjectileEntity.h - Entities/ProjectileArrow.h - Entities/ProjectileEgg.h - Entities/ProjectileEnderPearl.h - Entities/ProjectileExpBottle.h - Entities/ProjectileSnowball.h - Entities/ProjectileFireCharge.h - Entities/ProjectileFirework.h - Entities/ProjectileGhastFireball.h + Entities/ArrowEntity.h + Entities/ThrownEggEntity.h + Entities/ThrownEnderPearlEntity.h + Entities/ExpBottleEntity.h + Entities/ThrownSnowballEntity.h + Entities/FireChargeEntity.h + Entities/FireworkEntity.h + Entities/GhastFireballEntity.h Entities/TNTEntity.h Entities/ExpOrb.h Entities/HangingEntity.h diff --git a/src/Entities/ProjectileArrow.cpp b/src/Entities/ArrowEntity.cpp similarity index 89% rename from src/Entities/ProjectileArrow.cpp rename to src/Entities/ArrowEntity.cpp index 8bf680797..847b39bbc 100644 --- a/src/Entities/ProjectileArrow.cpp +++ b/src/Entities/ArrowEntity.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Player.h" -#include "ProjectileArrow.h" +#include "ArrowEntity.h" #include "../Chunk.h" @@ -9,14 +9,14 @@ cArrowEntity::cArrowEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : -super(pkArrow, a_Creator, a_X, a_Y, a_Z, 0.5, 0.5), -m_PickupState(psNoPickup), -m_DamageCoeff(2), -m_IsCritical(false), -m_Timer(0), -m_HitGroundTimer(0), -m_bIsCollected(false), -m_HitBlockPos(Vector3i(0, 0, 0)) + super(pkArrow, a_Creator, a_X, a_Y, a_Z, 0.5, 0.5), + m_PickupState(psNoPickup), + m_DamageCoeff(2), + m_IsCritical(false), + m_Timer(0), + m_HitGroundTimer(0), + m_bIsCollected(false), + m_HitBlockPos(Vector3i(0, 0, 0)) { SetSpeed(a_Speed); SetMass(0.1); @@ -33,15 +33,15 @@ m_HitBlockPos(Vector3i(0, 0, 0)) cArrowEntity::cArrowEntity(cPlayer & a_Player, double a_Force) : -super(pkArrow, &a_Player, a_Player.GetThrowStartPos(), a_Player.GetThrowSpeed(a_Force * 1.5 * 20), 0.5, 0.5), -m_PickupState(psInSurvivalOrCreative), -m_DamageCoeff(2), -m_IsCritical((a_Force >= 1)), -m_Timer(0), -m_HitGroundTimer(0), -m_HasTeleported(false), -m_bIsCollected(false), -m_HitBlockPos(0, 0, 0) + super(pkArrow, &a_Player, a_Player.GetThrowStartPos(), a_Player.GetThrowSpeed(a_Force * 1.5 * 20), 0.5, 0.5), + m_PickupState(psInSurvivalOrCreative), + m_DamageCoeff(2), + m_IsCritical((a_Force >= 1)), + m_Timer(0), + m_HitGroundTimer(0), + m_HasTeleported(false), + m_bIsCollected(false), + m_HitBlockPos(0, 0, 0) { } diff --git a/src/Entities/ProjectileArrow.h b/src/Entities/ArrowEntity.h similarity index 98% rename from src/Entities/ProjectileArrow.h rename to src/Entities/ArrowEntity.h index 18c30feae..1fe3032ee 100644 --- a/src/Entities/ProjectileArrow.h +++ b/src/Entities/ArrowEntity.h @@ -1,5 +1,5 @@ // -// ProjectileArrow.h +// ArrowEntity.h // #pragma once @@ -13,7 +13,7 @@ // tolua_begin class cArrowEntity : -public cProjectileEntity + public cProjectileEntity { typedef cProjectileEntity super; diff --git a/src/Entities/ProjectileExpBottle.cpp b/src/Entities/ExpBottleEntity.cpp similarity index 87% rename from src/Entities/ProjectileExpBottle.cpp rename to src/Entities/ExpBottleEntity.cpp index 936be6a72..202dde942 100644 --- a/src/Entities/ProjectileExpBottle.cpp +++ b/src/Entities/ExpBottleEntity.cpp @@ -1,6 +1,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "ProjectileExpBottle.h" +#include "ExpBottleEntity.h" #include "../World.h" @@ -8,7 +8,7 @@ cExpBottleEntity::cExpBottleEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : -super(pkExpBottle, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) + super(pkExpBottle, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) { SetSpeed(a_Speed); } diff --git a/src/Entities/ProjectileExpBottle.h b/src/Entities/ExpBottleEntity.h similarity index 89% rename from src/Entities/ProjectileExpBottle.h rename to src/Entities/ExpBottleEntity.h index 070c412e4..b2043d8f1 100644 --- a/src/Entities/ProjectileExpBottle.h +++ b/src/Entities/ExpBottleEntity.h @@ -1,5 +1,5 @@ // -// ProjectileExpBottle.h +// ExpBottleEntity.h // #pragma once @@ -13,7 +13,7 @@ // tolua_begin class cExpBottleEntity : -public cProjectileEntity + public cProjectileEntity { typedef cProjectileEntity super; diff --git a/src/Entities/ProjectileFireCharge.cpp b/src/Entities/FireChargeEntity.cpp similarity index 91% rename from src/Entities/ProjectileFireCharge.cpp rename to src/Entities/FireChargeEntity.cpp index 5bdb74462..aba32602f 100644 --- a/src/Entities/ProjectileFireCharge.cpp +++ b/src/Entities/FireChargeEntity.cpp @@ -1,6 +1,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "ProjectileFireCharge.h" +#include "FireChargeEntity.h" #include "../World.h" @@ -8,7 +8,7 @@ cFireChargeEntity::cFireChargeEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : -super(pkFireCharge, a_Creator, a_X, a_Y, a_Z, 0.3125, 0.3125) + super(pkFireCharge, a_Creator, a_X, a_Y, a_Z, 0.3125, 0.3125) { SetSpeed(a_Speed); SetGravity(0); diff --git a/src/Entities/ProjectileFireCharge.h b/src/Entities/FireChargeEntity.h similarity index 92% rename from src/Entities/ProjectileFireCharge.h rename to src/Entities/FireChargeEntity.h index bcf2b7af6..3924c337c 100644 --- a/src/Entities/ProjectileFireCharge.h +++ b/src/Entities/FireChargeEntity.h @@ -1,5 +1,5 @@ // -// ProjectileFireCharge.h +// FireChargeEntity.h // #pragma once @@ -13,7 +13,7 @@ // tolua_begin class cFireChargeEntity : -public cProjectileEntity + public cProjectileEntity { typedef cProjectileEntity super; diff --git a/src/Entities/ProjectileFirework.cpp b/src/Entities/FireworkEntity.cpp similarity index 90% rename from src/Entities/ProjectileFirework.cpp rename to src/Entities/FireworkEntity.cpp index dcb89fce3..403a53c84 100644 --- a/src/Entities/ProjectileFirework.cpp +++ b/src/Entities/FireworkEntity.cpp @@ -1,6 +1,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "ProjectileFirework.h" +#include "FireworkEntity.h" #include "../World.h" #include "../Chunk.h" @@ -9,9 +9,9 @@ cFireworkEntity::cFireworkEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const cItem & a_Item) : -super(pkFirework, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25), -m_ExplodeTimer(0), -m_FireworkItem(a_Item) + super(pkFirework, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25), + m_ExplodeTimer(0), + m_FireworkItem(a_Item) { } diff --git a/src/Entities/ProjectileFirework.h b/src/Entities/FireworkEntity.h similarity index 92% rename from src/Entities/ProjectileFirework.h rename to src/Entities/FireworkEntity.h index e7d7eacbf..c62ca9402 100644 --- a/src/Entities/ProjectileFirework.h +++ b/src/Entities/FireworkEntity.h @@ -1,5 +1,5 @@ // -// ProjectileFirework.h +// FireworkEntity.h // #pragma once @@ -13,7 +13,7 @@ // tolua_begin class cFireworkEntity : -public cProjectileEntity + public cProjectileEntity { typedef cProjectileEntity super; diff --git a/src/Entities/ProjectileGhastFireball.cpp b/src/Entities/GhastFireballEntity.cpp similarity index 90% rename from src/Entities/ProjectileGhastFireball.cpp rename to src/Entities/GhastFireballEntity.cpp index cac622562..9e4cb387e 100644 --- a/src/Entities/ProjectileGhastFireball.cpp +++ b/src/Entities/GhastFireballEntity.cpp @@ -1,6 +1,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "ProjectileGhastFireball.h" +#include "GhastFireballEntity.h" #include "../World.h" @@ -8,7 +8,7 @@ cGhastFireballEntity::cGhastFireballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : -super(pkGhastFireball, a_Creator, a_X, a_Y, a_Z, 1, 1) + super(pkGhastFireball, a_Creator, a_X, a_Y, a_Z, 1, 1) { SetSpeed(a_Speed); SetGravity(0); diff --git a/src/Entities/ProjectileGhastFireball.h b/src/Entities/GhastFireballEntity.h similarity index 92% rename from src/Entities/ProjectileGhastFireball.h rename to src/Entities/GhastFireballEntity.h index 6dd37783e..9e4572c78 100644 --- a/src/Entities/ProjectileGhastFireball.h +++ b/src/Entities/GhastFireballEntity.h @@ -1,5 +1,5 @@ // -// ProjectileGhastFireball.h +// GhastFireballEntity.h // #pragma once @@ -13,7 +13,7 @@ // tolua_begin class cGhastFireballEntity : -public cProjectileEntity + public cProjectileEntity { typedef cProjectileEntity super; diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index b2e6d469e..3e48d310c 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -13,14 +13,14 @@ #include "../ChunkMap.h" #include "../Chunk.h" -#include "ProjectileArrow.h" -#include "ProjectileEgg.h" -#include "ProjectileEnderPearl.h" -#include "ProjectileExpBottle.h" -#include "ProjectileSnowball.h" -#include "ProjectileFireCharge.h" -#include "ProjectileFirework.h" -#include "ProjectileGhastFireball.h" +#include "ArrowEntity.h" +#include "ThrownEggEntity.h" +#include "ThrownEnderPearlEntity.h" +#include "ExpBottleEntity.h" +#include "ThrownSnowballEntity.h" +#include "FireChargeEntity.h" +#include "FireworkEntity.h" +#include "GhastFireballEntity.h" diff --git a/src/Entities/ProjectileEgg.cpp b/src/Entities/ThrownEggEntity.cpp similarity index 93% rename from src/Entities/ProjectileEgg.cpp rename to src/Entities/ThrownEggEntity.cpp index 3f6e6525e..224019091 100644 --- a/src/Entities/ProjectileEgg.cpp +++ b/src/Entities/ThrownEggEntity.cpp @@ -1,6 +1,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "ProjectileEgg.h" +#include "ThrownEggEntity.h" #include "../World.h" @@ -8,7 +8,7 @@ cThrownEggEntity::cThrownEggEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : -super(pkEgg, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) + super(pkEgg, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) { SetSpeed(a_Speed); } diff --git a/src/Entities/ProjectileEgg.h b/src/Entities/ThrownEggEntity.h similarity index 93% rename from src/Entities/ProjectileEgg.h rename to src/Entities/ThrownEggEntity.h index ba1f6420e..5ba8f051b 100644 --- a/src/Entities/ProjectileEgg.h +++ b/src/Entities/ThrownEggEntity.h @@ -1,5 +1,5 @@ // -// ProjectileEgg.h +// ThrownEggEntity.h // #pragma once @@ -13,7 +13,7 @@ // tolua_begin class cThrownEggEntity : -public cProjectileEntity + public cProjectileEntity { typedef cProjectileEntity super; diff --git a/src/Entities/ProjectileEnderPearl.cpp b/src/Entities/ThrownEnderPearlEntity.cpp similarity index 91% rename from src/Entities/ProjectileEnderPearl.cpp rename to src/Entities/ThrownEnderPearlEntity.cpp index db32f47b7..c37161145 100644 --- a/src/Entities/ProjectileEnderPearl.cpp +++ b/src/Entities/ThrownEnderPearlEntity.cpp @@ -1,13 +1,13 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "ProjectileEnderPearl.h" +#include "ThrownEnderPearlEntity.h" cThrownEnderPearlEntity::cThrownEnderPearlEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : -super(pkEnderPearl, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) + super(pkEnderPearl, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) { SetSpeed(a_Speed); } diff --git a/src/Entities/ProjectileEnderPearl.h b/src/Entities/ThrownEnderPearlEntity.h similarity index 92% rename from src/Entities/ProjectileEnderPearl.h rename to src/Entities/ThrownEnderPearlEntity.h index 39761ff48..ddee5babe 100644 --- a/src/Entities/ProjectileEnderPearl.h +++ b/src/Entities/ThrownEnderPearlEntity.h @@ -1,5 +1,5 @@ // -// ProjectileEnderPearl.h +// ThrownEnderPearlEntity.h // #pragma once @@ -13,7 +13,7 @@ // tolua_begin class cThrownEnderPearlEntity : -public cProjectileEntity + public cProjectileEntity { typedef cProjectileEntity super; diff --git a/src/Entities/ProjectileSnowball.cpp b/src/Entities/ThrownSnowballEntity.cpp similarity index 90% rename from src/Entities/ProjectileSnowball.cpp rename to src/Entities/ThrownSnowballEntity.cpp index 536b9e791..427f630f7 100644 --- a/src/Entities/ProjectileSnowball.cpp +++ b/src/Entities/ThrownSnowballEntity.cpp @@ -1,6 +1,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "ProjectileSnowball.h" +#include "ThrownSnowballEntity.h" #include "../World.h" @@ -8,7 +8,7 @@ cThrownSnowballEntity::cThrownSnowballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : -super(pkSnowball, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) + super(pkSnowball, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) { SetSpeed(a_Speed); } diff --git a/src/Entities/ProjectileSnowball.h b/src/Entities/ThrownSnowballEntity.h similarity index 91% rename from src/Entities/ProjectileSnowball.h rename to src/Entities/ThrownSnowballEntity.h index 2443d05c6..a09512e37 100644 --- a/src/Entities/ProjectileSnowball.h +++ b/src/Entities/ThrownSnowballEntity.h @@ -1,5 +1,5 @@ // -// ProjectileSnowball.h +// ThrownSnowballEntity.h // #pragma once @@ -13,7 +13,7 @@ // tolua_begin class cThrownSnowballEntity : -public cProjectileEntity + public cProjectileEntity { typedef cProjectileEntity super; diff --git a/src/Items/ItemBow.h b/src/Items/ItemBow.h index a53d59b58..8c0b3a0a3 100644 --- a/src/Items/ItemBow.h +++ b/src/Items/ItemBow.h @@ -9,7 +9,7 @@ #pragma once -#include "../Entities/ProjectileArrow.h" +#include "../Entities/ArrowEntity.h" diff --git a/src/Mobs/Blaze.cpp b/src/Mobs/Blaze.cpp index 74683da94..326b42f07 100644 --- a/src/Mobs/Blaze.cpp +++ b/src/Mobs/Blaze.cpp @@ -3,7 +3,7 @@ #include "Blaze.h" #include "../World.h" -#include "../Entities/ProjectileFireCharge.h" +#include "../Entities/FireChargeEntity.h" diff --git a/src/Mobs/Ghast.cpp b/src/Mobs/Ghast.cpp index 7b82d3181..d8a7663f8 100644 --- a/src/Mobs/Ghast.cpp +++ b/src/Mobs/Ghast.cpp @@ -3,7 +3,7 @@ #include "Ghast.h" #include "../World.h" -#include "../Entities/ProjectileGhastFireball.h" +#include "../Entities/GhastFireballEntity.h" diff --git a/src/Mobs/Skeleton.cpp b/src/Mobs/Skeleton.cpp index 3b9e1c5f4..1e62d7987 100644 --- a/src/Mobs/Skeleton.cpp +++ b/src/Mobs/Skeleton.cpp @@ -3,7 +3,7 @@ #include "Skeleton.h" #include "../World.h" -#include "../Entities/ProjectileArrow.h" +#include "../Entities/ArrowEntity.h" diff --git a/src/Protocol/Protocol125.cpp b/src/Protocol/Protocol125.cpp index 2f57d3cf1..9502f9bec 100644 --- a/src/Protocol/Protocol125.cpp +++ b/src/Protocol/Protocol125.cpp @@ -26,7 +26,7 @@ Documentation: #include "../Root.h" #include "../Server.h" -#include "../Entities/ProjectileArrow.h" +#include "../Entities/ArrowEntity.h" #include "../Entities/Minecart.h" #include "../Entities/FallingBlock.h" diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index 468c4cf2b..2cc0adbfb 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -31,8 +31,8 @@ Implements the 1.7.x protocol classes: #include "../BlockEntities/MobHeadEntity.h" #include "../BlockEntities/FlowerPotEntity.h" #include "../CompositeChat.h" -#include "../Entities/ProjectileArrow.h" -#include "../Entities/ProjectileFirework.h" +#include "../Entities/ArrowEntity.h" +#include "../Entities/FireworkEntity.h" diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp index 02ced7038..41e0d89fd 100644 --- a/src/WorldStorage/NBTChunkSerializer.cpp +++ b/src/WorldStorage/NBTChunkSerializer.cpp @@ -28,7 +28,7 @@ #include "../Entities/Boat.h" #include "../Entities/Minecart.h" #include "../Entities/Pickup.h" -#include "../Entities/ProjectileArrow.h" +#include "../Entities/ArrowEntity.h" #include "../Entities/TNTEntity.h" #include "../Entities/ExpOrb.h" #include "../Entities/HangingEntity.h" diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index e702c4f1e..809cb9e42 100644 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -35,12 +35,12 @@ #include "../Entities/FallingBlock.h" #include "../Entities/Minecart.h" #include "../Entities/Pickup.h" -#include "../Entities/ProjectileArrow.h" -#include "../Entities/ProjectileEgg.h" -#include "../Entities/ProjectileEnderPearl.h" -#include "../Entities/ProjectileSnowball.h" -#include "../Entities/ProjectileFireCharge.h" -#include "../Entities/ProjectileGhastFireball.h" +#include "../Entities/ArrowEntity.h" +#include "../Entities/ThrownEggEntity.h" +#include "../Entities/ThrownEnderPearlEntity.h" +#include "../Entities/ThrownSnowballEntity.h" +#include "../Entities/FireChargeEntity.h" +#include "../Entities/GhastFireballEntity.h" #include "../Entities/TNTEntity.h" #include "../Entities/ExpOrb.h" #include "../Entities/HangingEntity.h"