Version include cleanups to ESS.

editor/fileserver/editor_file_server.h

@@ -31,8 +31,6 @@
 /*************************************************************************/
 
 
-
-
 #include "core/io/file_access_network.h"
 #include "core/io/packet_peer.h"
 #include "core/io/tcp_server.h"

modules/broken_seals_module/biome_terrarin_generator.cpp

@@ -24,11 +24,7 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/config/engine.h"
-#else
 #include "core/engine.h"
-#endif
 
 #include "core/math/math_funcs.h"
 

modules/broken_seals_module/biome_terrarin_generator.h

@@ -27,11 +27,7 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#else
 #include "core/reference.h"
-#endif
 
 #ifdef VOXELMAN_PRESENT
 class VoxelChunk;

modules/entity_spell_system/data/atlases/character_atlas.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class CharacterAtlas : public Resource {
 	GDCLASS(CharacterAtlas, Resource);

modules/entity_spell_system/data/atlases/character_atlas_entry.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class CharacterAtlasEntry : public Resource {
 	GDCLASS(CharacterAtlasEntry, Resource);

modules/entity_spell_system/data/auras/aura_group.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class AuraGroup : public Resource {
 	GDCLASS(AuraGroup, Resource);

modules/entity_spell_system/data/items/craft_recipe.h

@@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#else
 #include "core/resource.h"
 #include "core/vector.h"
 #include "core/ustring.h"
-#endif
 
 #include "item_template.h"
 

modules/entity_spell_system/data/items/craft_recipe_helper.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "item_template.h"
 

modules/entity_spell_system/data/items/equipment_data.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class ItemInstance;
 class ItemTemplate;

modules/entity_spell_system/data/items/item_instance.cpp

@@ -27,8 +27,6 @@ SOFTWARE.
 #include "../../database/ess_resource_db.h"
 #include "../../singletons/ess.h"
 
-#include "core/version.h"
-
 Ref<ItemTemplate> ItemInstance::get_item_template() {
 	return _item_template;
 }
@@ -197,11 +195,7 @@ Dictionary ItemInstance::_to_dict() {
 	return dict;
 }
 void ItemInstance::_from_dict(const Dictionary &dict) {
-#if VERSION_MAJOR > 3
-	ERR_FAIL_COND(dict.is_empty());
-#else
 	ERR_FAIL_COND(dict.empty());
-#endif
 
 	_item_template_path = dict.get("item_path", 0);
 

modules/entity_spell_system/data/items/item_instance.h

@@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#else
 #include "core/resource.h"
 #include "core/vector.h"
-#endif
 
 #include "../../item_enums.h"
 

modules/entity_spell_system/data/items/item_template.h

@@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#else
 #include "core/resource.h"
 #include "core/vector.h"
-#endif
 
 #include "scene/resources/texture.h"
 

modules/entity_spell_system/data/items/model_visual.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "../../item_enums.h"
 #include "model_visual_entry.h"

modules/entity_spell_system/data/items/model_visual_entry.h

@@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
+#include "core/color.h"
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/string/ustring.h"
-#include "core/math/color.h"
-#else
 #include "core/resource.h"
 #include "core/ustring.h"
-#include "core/color.h"
-#endif
 
 #include "scene/resources/texture.h"
 

modules/entity_spell_system/data/loot/loot_data_base.h

@@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/templates/vector.h"
-#include "core/variant/array.h"
-#else
 #include "core/vector.h"
 #include "core/array.h"
-#endif
 
 #include "../items/item_template.h"
 

modules/entity_spell_system/data/species/entity_species_data.h

@@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#else
 #include "core/resource.h"
 #include "core/vector.h"
 #include "core/ustring.h"
-#endif
 
 #include "../../entity_enums.h"
 

modules/entity_spell_system/data/species/species_instance.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "../items/model_visual_entry.h"
 

modules/entity_spell_system/data/species/species_model_data.cpp

@@ -22,16 +22,10 @@ SOFTWARE.
 
 #include "species_model_data.h"
 
-#include "core/version.h"
-
 #include "../../defines.h"
 #include "../../singletons/ess.h"
 
-#if VERSION_MAJOR > 3
-#include "core/string/ustring.h"
-#else
 #include "core/ustring.h"
-#endif
 
 
 int SpeciesModelData::get_id() {

modules/entity_spell_system/data/species/species_model_data.h

@@ -22,22 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#include "core/math/color.h"
-#else
-#include "core/resource.h"
-#include "core/vector.h"
-#include "core/ustring.h"
 #include "core/color.h"
-#endif
+#include "core/resource.h"
+#include "core/ustring.h"
+#include "core/vector.h"
 
 #include "scene/resources/packed_scene.h"
 
@@ -134,9 +122,9 @@ private:
 	String _customizable_slots_string;
 	String _customizable_color_slots_string;
 
-	Vector<Ref<ModelVisualEntry> > _visuals;
+	Vector<Ref<ModelVisualEntry>> _visuals;
 
-	Vector<Vector<Ref<ModelVisualEntry> > > _customizable_slots;
+	Vector<Vector<Ref<ModelVisualEntry>>> _customizable_slots;
 	Vector<ColorSlotData> _customizable_color_slots;
 };
 

modules/entity_spell_system/data/spells/spell.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "scene/resources/texture.h"
 

modules/entity_spell_system/data/spells/spell_cooldown_manipulation_data.h

@@ -23,15 +23,7 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class SpellCooldownManipulationData : public Reference {
 	GDCLASS(SpellCooldownManipulationData, Reference);

modules/entity_spell_system/data/spells/spell_effect_visual.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class SpellEffectVisual : public Resource {
 	GDCLASS(SpellEffectVisual, Resource);

modules/entity_spell_system/data/spells/spell_effect_visual_simple.h

@@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
 #include "spell_effect_visual.h"
 
 #include "scene/resources/packed_scene.h"

modules/entity_spell_system/database/ess_resource_db.h

@@ -22,26 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#include "core/templates/hash_map.h"
-#include "core/string/ustring.h"
-#include "core/core_bind.h"
-#include "core/variant/variant.h"
-#else
 #include "core/resource.h"
 #include "core/vector.h"
 #include "core/hash_map.h"
 #include "core/ustring.h"
 #include "core/bind/core_bind.h"
 #include "core/variant.h"
-#endif
 
 #include "../item_enums.h"
 

modules/entity_spell_system/database/ess_resource_db_folders.h

@@ -22,28 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/variant/variant.h"
-#include "core/templates/vector.h"
-#include "core/templates/hash_map.h"
-#include "core/string/ustring.h"
-#include "core/config/engine.h"
-#include "core/variant/array.h"
-#include "core/core_bind.h"
-#else
-#include "core/variant.h"
-#include "core/vector.h"
-#include "core/hash_map.h"
-#include "core/ustring.h"
-#include "core/engine.h"
 #include "core/array.h"
 #include "core/bind/core_bind.h"
-#endif
+#include "core/engine.h"
+#include "core/hash_map.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 #include "ess_resource_db_map.h"
 

modules/entity_spell_system/database/ess_resource_db_map.h

@@ -22,30 +22,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
 #include "ess_resource_db.h"
 
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/variant/variant.h"
-#include "core/templates/vector.h"
-#include "core/templates/hash_map.h"
-#include "core/string/ustring.h"
-#include "core/config/engine.h"
-#include "core/variant/array.h"
-#include "core/core_bind.h"
-#else
-#include "core/variant.h"
-#include "core/vector.h"
-#include "core/hash_map.h"
-#include "core/ustring.h"
-#include "core/engine.h"
 #include "core/array.h"
 #include "core/bind/core_bind.h"
-#endif
+#include "core/engine.h"
+#include "core/hash_map.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 #include "scene/main/node.h"
 
@@ -123,26 +108,26 @@ protected:
 	static void _bind_methods();
 
 private:
-	Vector<Ref<EntityResource> > _entity_resources;
+	Vector<Ref<EntityResource>> _entity_resources;
-	HashMap<int, Ref<EntityResource> > _entity_resource_map;
+	HashMap<int, Ref<EntityResource>> _entity_resource_map;
 
-	Vector<Ref<EntitySkillData> > _entity_skills;
+	Vector<Ref<EntitySkillData>> _entity_skills;
-	HashMap<int, Ref<EntitySkillData> > _entity_skill_map;
+	HashMap<int, Ref<EntitySkillData>> _entity_skill_map;
 
-	Vector<Ref<EntityData> > _entity_datas;
+	Vector<Ref<EntityData>> _entity_datas;
-	HashMap<int, Ref<EntityData> > _entity_data_map;
+	HashMap<int, Ref<EntityData>> _entity_data_map;
 
-	Vector<Ref<Spell> > _spells;
+	Vector<Ref<Spell>> _spells;
-	HashMap<int, Ref<Spell> > _spell_map;
+	HashMap<int, Ref<Spell>> _spell_map;
 
-	Vector<Ref<CraftRecipe> > _craft_recipes;
+	Vector<Ref<CraftRecipe>> _craft_recipes;
-	HashMap<int, Ref<CraftRecipe> > _craft_recipe_map;
+	HashMap<int, Ref<CraftRecipe>> _craft_recipe_map;
 
-	Vector<Ref<ItemTemplate> > _item_templates;
+	Vector<Ref<ItemTemplate>> _item_templates;
-	HashMap<int, Ref<ItemTemplate> > _item_template_map;
+	HashMap<int, Ref<ItemTemplate>> _item_template_map;
 
-	Vector<Ref<EntitySpeciesData> > _entity_species_datas;
+	Vector<Ref<EntitySpeciesData>> _entity_species_datas;
-	HashMap<int, Ref<EntitySpeciesData> > _entity_species_data_map;
+	HashMap<int, Ref<EntitySpeciesData>> _entity_species_data_map;
 };
 
 #endif

modules/entity_spell_system/database/ess_resource_db_static.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/templates/hash_map.h"
-#else
 #include "core/hash_map.h"
-#endif
 
 #include "ess_resource_db.h"
 
@@ -122,13 +113,13 @@ protected:
 private:
 	bool _remap_ids;
 
-	Vector<Ref<EntityResource> > _entity_resources;
+	Vector<Ref<EntityResource>> _entity_resources;
-	Vector<Ref<EntitySkillData> > _entity_skills;
+	Vector<Ref<EntitySkillData>> _entity_skills;
-	Vector<Ref<EntityData> > _entity_datas;
+	Vector<Ref<EntityData>> _entity_datas;
-	Vector<Ref<Spell> > _spells;
+	Vector<Ref<Spell>> _spells;
-	Vector<Ref<CraftRecipe> > _craft_recipes;
+	Vector<Ref<CraftRecipe>> _craft_recipes;
-	Vector<Ref<ItemTemplate> > _item_templates;
+	Vector<Ref<ItemTemplate>> _item_templates;
-	Vector<Ref<EntitySpeciesData> > _entity_species_datas;
+	Vector<Ref<EntitySpeciesData>> _entity_species_datas;
 };
 
 #endif

modules/entity_spell_system/defines.h

@@ -2,70 +2,6 @@
 #ifndef ESS_DEFINES_H
 #define ESS_DEFINES_H
 
-#include "core/version.h"
-
-#if VERSION_MAJOR >= 4
-#define GODOT4 true
-#endif
-
-//includes
-#if GODOT4
-#define spatial_h_path "scene/3d/node_3d.h"
-#define visual_server_h_path include "servers/rendering_server.h"
-
-//#include "core/input/input_event.h"
-//#include "editor/plugins/node_3d_editor_plugin.h"
-//#include "scene/3d/camera_3d.h"
-#else
-#define spatial_h_path "scene/3d/spatial.h"
-#define visual_server_h_path include "servers/visual_server.h"
-
-//#include "core/os/input.h"
-//#include "editor/plugins/spatial_editor_plugin.h"
-//#include "scene/3d/camera.h"
-
-#endif
-
-//Type Defines
-#if GODOT4
-#define PhysicsDirectSpaceState PhysicsDirectSpaceState3D
-#define SpatialEditor Node3DEditor
-#define SpatialEditorPlugin Node3DEditorPlugin
-#define SpatialEditorViewport Node3DEditorViewport
-#define PoolStringArray PackedStringArray
-
-#define REAL FLOAT
-
-#define POOL_STRING_ARRAY PACKED_STRING_ARRAY
-#define POOL_INT_ARRAY PACKED_INT32_ARRAY
-#define POOL_REAL_ARRAY PACKED_FLOAT32_ARRAY
-
-#define Spatial Node3D
-
-typedef class RenderingServer VisualServer;
-typedef class RenderingServer VS;
-
-#define PoolVector3Array PackedVector3Array
-#define PoolVector2Array PackedVector2Array
-#define PoolColorArray PackedColorArray
-#define PoolIntArray PackedInt64Array
-#define PoolRealArray PackedFloat32Array
-
-//toodo figure out a way to have this
-//#define Variant::CallError Callable::CallError
-#endif
-
-#if GODOT4
-
-#define VARIANT_ARRAY_GET(arr)             \
-	Vector<Variant> r;                     \
-	for (int i = 0; i < arr.size(); i++) { \
-		r.push_back(arr[i]);               \
-	}                                      \
-	return r;
-
-#else
-
 #define VARIANT_ARRAY_GET(arr)             \
 	Vector<Variant> r;                     \
 	for (int i = 0; i < arr.size(); i++) { \
@@ -73,8 +9,6 @@ typedef class RenderingServer VS;
 	}                                      \
 	return r;
 
-#endif
-
 #define VARIANT_ARRAY_SET(arr, arr_into, type) \
 	arr_into.clear();                          \
 	for (int i = 0; i < arr.size(); i++) {     \
@@ -82,15 +16,9 @@ typedef class RenderingServer VS;
 		arr_into.push_back(e);                 \
 	}
 
-#if GODOT4
+
-//TODO do this properly
-#define INSTANCE_VALIDATE(var) var
-#define CONNECT(sig, obj, target_method_class, method) connect(sig, callable_mp(obj, &target_method_class::method))
-#define DISCONNECT(sig, obj, target_method_class, method) disconnect(sig, callable_mp(obj, &target_method_class::method))
-#else
 #define INSTANCE_VALIDATE(var) ObjectDB::instance_validate(var)
 #define CONNECT(sig, obj, target_method_class, method) connect(sig, obj, #method)
 #define DISCONNECT(sig, obj, target_method_class, method) disconnect(sig, obj, #method)
-#endif
 
 #endif

modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h

@@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/string/ustring.h"
-#else
 #include "core/reference.h"
 #include "core/ustring.h"
-#endif
 
 #include "scene/main/node.h"
 

modules/entity_spell_system/editor/ess_editor_plugin.h

@@ -22,16 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 
 #include "core/version.h"
 
 class ESSEditorPlugin : public EditorPlugin {
-
 	GDCLASS(ESSEditorPlugin, EditorPlugin);
 	EditorNode *editor;
 

modules/entity_spell_system/entities/ai/entity_ai.h

@@ -23,15 +23,7 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "scene/main/node.h"
 

modules/entity_spell_system/entities/auras/aura_data.cpp

@@ -22,8 +22,6 @@ SOFTWARE.
 
 #include "aura_data.h"
 
-#include "core/version.h"
-
 #include "../../data/spells/spell.h"
 #include "../../database/ess_resource_db.h"
 #include "../../singletons/ess.h"
@@ -308,11 +306,7 @@ Dictionary AuraData::_to_dict() {
 	return dict;
 }
 void AuraData::_from_dict(const Dictionary &dict) {
-#if VERSION_MAJOR > 3
-	ERR_FAIL_COND(dict.is_empty());
-#else
 	ERR_FAIL_COND(dict.empty());
-#endif
 	ERR_FAIL_COND(!ESS::get_singleton()->get_resource_db().is_valid());
 
 	_aura_id = dict.get("aura_id", 0);

modules/entity_spell_system/entities/auras/aura_data.h

@@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/variant/array.h"
-#include "core/variant/dictionary.h"
-#else
-#include "core/resource.h"
 #include "core/array.h"
 #include "core/dictionary.h"
-#endif
+#include "core/resource.h"
 
 #include "../../spell_enums.h"
 

modules/entity_spell_system/entities/data/character_spec.h

@@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#else
 #include "core/resource.h"
-#include "core/vector.h"
 #include "core/ustring.h"
-#endif
+#include "core/vector.h"
 
 class Spell;
 
@@ -74,7 +63,7 @@ protected:
 
 private:
 	int _id;
-	Vector<Vector<Vector<Ref<Spell> > > > _rows;
+	Vector<Vector<Vector<Ref<Spell>>>> _rows;
 };
 
 #endif

modules/entity_spell_system/entities/data/entity_class_data.h

@@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#else
 #include "core/resource.h"
-#include "core/vector.h"
 #include "core/ustring.h"
-#endif
+#include "core/vector.h"
 
 #include "core/math/math_funcs.h"
 #include "scene/resources/texture.h"
@@ -190,18 +179,18 @@ private:
 
 	Ref<StatData> _stat_data;
 
-	Vector<Ref<EntityResource> > _entity_resources;
+	Vector<Ref<EntityResource>> _entity_resources;
-	Vector<Ref<CharacterSpec> > _specs;
+	Vector<Ref<CharacterSpec>> _specs;
-	Vector<Ref<Spell> > _spells;
+	Vector<Ref<Spell>> _spells;
-	Vector<Ref<Spell> > _start_spells;
+	Vector<Ref<Spell>> _start_spells;
-	Vector<Ref<Spell> > _auras;
+	Vector<Ref<Spell>> _auras;
 
 	Ref<VendorItemData> _vendor_item_data;
 	Ref<VendorItemData> _spell_train_data;
 	Ref<ItemContainerData> _item_container_data;
-	Vector<Ref<CraftRecipe> > _craft_recipes;
+	Vector<Ref<CraftRecipe>> _craft_recipes;
 
-	Vector<Ref<EntityAI> > _ais;
+	Vector<Ref<EntityAI>> _ais;
 };
 
 #endif

modules/entity_spell_system/entities/data/entity_data.h

@@ -22,20 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#else
 #include "core/resource.h"
-#include "core/vector.h"
 #include "core/ustring.h"
-#endif
+#include "core/vector.h"
 
 #include "scene/resources/texture.h"
 

modules/entity_spell_system/entities/data/entity_data_container.h

@@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/variant/dictionary.h"
-#else
-#include "core/resource.h"
 #include "core/dictionary.h"
-#endif
+#include "core/resource.h"
 
 class EntityDataContainer : public Resource {
 	GDCLASS(EntityDataContainer, Resource);

modules/entity_spell_system/entities/data/item_container_data.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "item_container_data_entry.h"
 
@@ -55,7 +46,7 @@ protected:
 	static void _bind_methods();
 
 private:
-	Vector<Ref<ItemContainerDataEntry> > _container_datas;
+	Vector<Ref<ItemContainerDataEntry>> _container_datas;
 };
 
 #endif

modules/entity_spell_system/entities/data/item_container_data_entry.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class ItemTemplate;
 

modules/entity_spell_system/entities/data/vendor_item_data.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "vendor_item_data_entry.h"
 
@@ -55,7 +46,7 @@ protected:
 	static void _bind_methods();
 
 private:
-	Vector<Ref<VendorItemDataEntry> > _vendor_datas;
+	Vector<Ref<VendorItemDataEntry>> _vendor_datas;
 };
 
 #endif

modules/entity_spell_system/entities/data/vendor_item_data_entry.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class ItemTemplate;
 class Spell;

modules/entity_spell_system/entities/entity.cpp

@@ -43,11 +43,7 @@ SOFTWARE.
 #include "./skills/entity_skill.h"
 #include "scene/2d/node_2d.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/script_language.h"
-#else
 #include "core/script_language.h"
-#endif
 
 #include "core/version.h"
 
@@ -650,22 +646,14 @@ void Entity::setup(Ref<EntityCreateInfo> info) {
 		sets_entity_name(info->get_entity_name());
 	}
 
-#if VERSION_MAJOR > 3
-	if (!info->get_serialized_data().is_empty()) {
-#else
 	if (!info->get_serialized_data().empty()) {
-#endif
 		from_dict(info->get_serialized_data());
 	} else {
 		sets_entity_data(info->get_entity_data());
 	}
 
 	if (has_method("_setup")) {
-#if GODOT4
-		call("_setup");
-#else
 		call_multilevel("_setup");
-#endif
 	}
 }
 
@@ -1081,11 +1069,7 @@ void Entity::pet_removec_index(int index) {
 
 	_c_pets.remove(index);
 
-	//#if VERSION_MAJOR < 4
 	//ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
-	//#else
-	//ERR_FAIL_COND(entity == NULL);
-	//#endif
 
 	//full callback stack spet_added
 }
@@ -1359,11 +1343,7 @@ Dictionary Entity::_to_dict() {
 	return dict;
 }
 void Entity::_from_dict(const Dictionary &dict) {
-#if VERSION_MAJOR > 3
-	ERR_FAIL_COND(dict.is_empty());
-#else
 	ERR_FAIL_COND(dict.empty());
-#endif
 
 	////    Transforms    ////
 
@@ -1658,11 +1638,7 @@ void Entity::_from_dict(const Dictionary &dict) {
 
 	Dictionary bagd = dict.get("bag", Dictionary());
 
-#if VERSION_MAJOR > 3
-	if (!bagd.is_empty()) {
-#else
 	if (!bagd.empty()) {
-#endif
 		if (!_s_bag.is_valid()) {
 			Ref<Bag> bag;
 			bag.instance();
@@ -1801,16 +1777,10 @@ PoolIntArray Entity::states_gets() const {
 	PoolIntArray arr;
 	arr.resize(EntityEnums::ENTITY_STATE_TYPE_INDEX_MAX);
 
-#if !GODOT4
 	PoolIntArray::Write w = arr.write();
-#endif
 
 	for (int i = 0; i < EntityEnums::ENTITY_STATE_TYPE_INDEX_MAX; ++i) {
-#if !GODOT4
 		w[i] = _s_states[i];
-#else
-		arr.write[i] = _s_states[i];
-#endif
 	}
 
 	return arr;
@@ -4943,16 +4913,10 @@ PoolIntArray Entity::sclass_talents_get() {
 	PoolIntArray arr;
 	arr.resize(_s_class_talents.size());
 
-#if !GODOT4
 	PoolIntArray::Write w = arr.write();
-#endif
 
 	for (int i = 0; i < _s_class_talents.size(); ++i) {
-#if !GODOT4
 		w[i] = _s_class_talents[i];
-#else
-		arr.write[i] = _s_class_talents[i];
-#endif
 	}
 
 	return arr;
@@ -5190,16 +5154,10 @@ PoolIntArray Entity::scharacter_talents_get() {
 	PoolIntArray arr;
 	arr.resize(_s_character_talents.size());
 
-#if !GODOT4
 	PoolIntArray::Write w = arr.write();
-#endif
 
 	for (int i = 0; i < _s_character_talents.size(); ++i) {
-#if !GODOT4
 		w[i] = _s_character_talents[i];
-#else
-		arr.write[i] = _s_character_talents[i];
-#endif
 	}
 
 	return arr;
@@ -5810,28 +5768,16 @@ void Entity::vrpc(const StringName &p_method, VARIANT_ARG_DECLARE) {
 		rpcp(get_network_master(), false, p_method, argptr, argc);
 }
 
-#if VERSION_MAJOR < 4
 Variant Entity::_vrpc_bind(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-#else
-Variant Entity::_vrpc_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
-#endif
 	if (p_argcount < 1) {
-#if VERSION_MAJOR < 4
 		r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
-#else
-		r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
-#endif
 
 		r_error.argument = 1;
 		return Variant();
 	}
 
 	if (p_args[0]->get_type() != Variant::STRING) {
-#if VERSION_MAJOR < 4
 		r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-#else
-		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
-#endif
 
 		r_error.argument = 0;
 		r_error.expected = Variant::STRING;
@@ -5843,12 +5789,7 @@ Variant Entity::_vrpc_bind(const Variant **p_args, int p_argcount, Callable::Cal
 	for (int i = 0; i < _s_seen_by.size(); ++i) {
 		Entity *e = _s_seen_by.get(i);
 
-#if VERSION_MAJOR < 4
 		if (unlikely(!ObjectDB::instance_validate(e))) {
-#else
-		if (unlikely(e == NULL)) {
-#endif
-
 			_s_seen_by.remove(i);
 			--i;
 			continue;
@@ -5862,11 +5803,7 @@ Variant Entity::_vrpc_bind(const Variant **p_args, int p_argcount, Callable::Cal
 
 	//call(method, &p_args[1], p_argcount - 1);
 
-#if VERSION_MAJOR < 4
 	r_error.error = Variant::CallError::CALL_OK;
-#else
-	r_error.error = Callable::CallError::CALL_OK;
-#endif
 
 	return Variant();
 }

modules/entity_spell_system/entities/entity.h

@@ -23,19 +23,9 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/object/object.h"
-#include "core/string/ustring.h"
-#include "core/templates/vector.h"
-#else
 #include "core/object.h"
 #include "core/ustring.h"
 #include "core/vector.h"
-#endif
 
 #include "core/io/networked_multiplayer_peer.h"
 
@@ -69,7 +59,7 @@ SOFTWARE.
 
 #include "../defines.h"
 
-#include spatial_h_path
+#include "scene/3d/spatial.h"
 
 class EntityData;
 class AuraData;
@@ -1090,11 +1080,7 @@ public:
 	int seen_by_gets_count();
 
 	void vrpc(const StringName &p_method, VARIANT_ARG_LIST);
-#if VERSION_MAJOR < 4
 	Variant _vrpc_bind(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
-#else
-	Variant _vrpc_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
-#endif
 
 	Dictionary data_as_dict(String &data);
 

modules/entity_spell_system/entities/resources/entity_resource.h

@@ -23,15 +23,7 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "../../defines.h"
 

modules/entity_spell_system/entities/resources/entity_resource_cost_data.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "entity_resource.h"
 #include "entity_resource_cost_data.h"

modules/entity_spell_system/entities/resources/entity_resource_cost_data_health.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "entity_resource.h"
 #include "entity_resource_cost_data.h"

modules/entity_spell_system/entities/resources/entity_resource_cost_data_resource.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "entity_resource.h"
 #include "entity_resource_cost_data.h"

modules/entity_spell_system/entities/resources/entity_resource_health.h

@@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
 #include "entity_resource.h"
 
 class Entity;

modules/entity_spell_system/entities/resources/entity_resource_speed.h

@@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
 #include "entity_resource.h"
 
 class Entity;

modules/entity_spell_system/entities/skills/entity_skill.cpp

@@ -22,8 +22,6 @@ SOFTWARE.
 
 #include "entity_skill.h"
 
-#include "core/version.h"
-
 #include "../../database/ess_resource_db.h"
 #include "../../singletons/ess.h"
 
@@ -103,11 +101,7 @@ Dictionary EntitySkill::_to_dict() {
 	return dict;
 }
 void EntitySkill::_from_dict(const Dictionary &dict) {
-#if VERSION_MAJOR > 3
-	ERR_FAIL_COND(dict.is_empty());
-#else
 	ERR_FAIL_COND(dict.empty());
-#endif
 
 	_skill_id = dict.get("skill_id", 0);
 	_skill_path = dict.get("skill_path", "");

modules/entity_spell_system/entities/skills/entity_skill.h

@@ -23,15 +23,7 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "entity_skill_data.h"
 

modules/entity_spell_system/entities/skills/entity_skill_data.h

@@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/string/ustring.h"
-#else
 #include "core/resource.h"
 #include "core/ustring.h"
-#endif
 
 class EntitySkillData : public Resource {
 	GDCLASS(EntitySkillData, Resource);

modules/entity_spell_system/entities/stats/complex_level_stat_data.h

@@ -23,15 +23,7 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "../../entity_enums.h"
 #include "level_stat_data.h"

modules/entity_spell_system/entities/stats/level_stat_data.h

@@ -23,15 +23,7 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class LevelStatData : public Resource {
 	GDCLASS(LevelStatData, Resource);

modules/entity_spell_system/entities/stats/simple_level_stat_data.h

@@ -23,16 +23,6 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
-#include "core/resource.h"
-#endif
-
 #include "level_stat_data.h"
 
 class SimpleLevelStatData : public LevelStatData {

modules/entity_spell_system/entities/stats/stat_data.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "scene/resources/curve.h"
 

modules/entity_spell_system/entity_enums.h

@@ -27,14 +27,8 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/object.h"
-#include "core/string/ustring.h"
-#include "core/object/class_db.h"
-#else
 #include "core/object.h"
 #include "core/ustring.h"
-#endif
 
 class EntityEnums : public Object {
 	GDCLASS(EntityEnums, Object);

modules/entity_spell_system/formations/ai_formation.h

@@ -23,15 +23,7 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 #include "scene/main/node.h"
 

modules/entity_spell_system/infos/aura_infos.h

@@ -23,15 +23,7 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#else
 #include "core/reference.h"
-#endif
 
 #include "../entities/entity.h"
 

modules/entity_spell_system/infos/spell_cast_info.h

@@ -22,16 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#else
 #include "core/resource.h"
-#endif
 
 class Spell;
 class Entity;

modules/entity_spell_system/inventory/bag.h

@@ -23,17 +23,8 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#else
 #include "core/resource.h"
 #include "core/vector.h"
-#endif
 
 #include "../item_enums.h"
 

modules/entity_spell_system/inventory/grid_bag.h

@@ -23,17 +23,8 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#else
 #include "core/resource.h"
 #include "core/vector.h"
-#endif
 
 #include "../item_enums.h"
 

modules/entity_spell_system/inventory/inventory.h

@@ -23,17 +23,8 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#else
 #include "core/resource.h"
 #include "core/vector.h"
-#endif
 
 #include "../item_enums.h"
 

modules/entity_spell_system/inventory/normal_bag.h

@@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/templates/vector.h"
-#else
 #include "core/resource.h"
 #include "core/vector.h"
-#endif
 
 #include "../item_enums.h"
 

modules/entity_spell_system/item_enums.h

@@ -27,14 +27,8 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/object.h"
-#include "core/string/ustring.h"
-#include "core/object/class_db.h"
-#else
 #include "core/object.h"
 #include "core/ustring.h"
-#endif
 
 class ItemEnums : public Object {
 	GDCLASS(ItemEnums, Object);

modules/entity_spell_system/material_cache/ess_material_cache.cpp

@@ -38,17 +38,6 @@ SOFTWARE.
 
 #include "../singletons/ess.h"
 
-#if VERSION_MAJOR > 3
-
-#define VARIANT_ARRAY_GET(arr)             \
-	Vector<Variant> r;                     \
-	for (int i = 0; i < arr.size(); i++) { \
-		r.push_back(arr[i]);               \
-	}                                      \
-	return r;
-
-#else
-
 #define VARIANT_ARRAY_GET(arr)             \
 	Vector<Variant> r;                     \
 	for (int i = 0; i < arr.size(); i++) { \
@@ -56,8 +45,6 @@ SOFTWARE.
 	}                                      \
 	return r;
 
-#endif
-
 bool ESSMaterialCache::get_initialized() {
 	return _initialized;
 }

modules/entity_spell_system/material_cache/ess_material_cache.h

@@ -23,19 +23,9 @@ SOFTWARE.
 */
 
 
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/math/color.h"
-#include "core/templates/vector.h"
-#else
 #include "core/color.h"
 #include "core/resource.h"
 #include "core/vector.h"
-#endif
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"

modules/entity_spell_system/material_cache/ess_material_cache_pcm.h

@@ -29,15 +29,9 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/math/color.h"
-#include "core/templates/vector.h"
-#else
 #include "core/color.h"
 #include "core/resource.h"
 #include "core/vector.h"
-#endif
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"

modules/entity_spell_system/pipelines/spell_damage_info.h

@@ -27,11 +27,7 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#else
 #include "core/reference.h"
-#endif
 
 #include "../spell_enums.h"
 #include "scene/main/node.h"

modules/entity_spell_system/pipelines/spell_heal_info.h

@@ -24,14 +24,7 @@ SOFTWARE.
 
 
 
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#else
 #include "core/reference.h"
-#endif
 
 #include "../spell_enums.h"
 #include "scene/main/node.h"

modules/entity_spell_system/profiles/actionbar/action_bar_button_entry.h

@@ -27,13 +27,8 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/variant/dictionary.h"
-#else
 #include "core/reference.h"
 #include "core/dictionary.h"
-#endif
 
 class ActionBarEntry;
 

modules/entity_spell_system/profiles/actionbar/action_bar_entry.h

@@ -27,17 +27,10 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/templates/vector.h"
-#include "core/variant/array.h"
-#include "core/variant/dictionary.h"
-#else
 #include "core/reference.h"
 #include "core/vector.h"
 #include "core/array.h"
 #include "core/dictionary.h"
-#endif
 
 #include "action_bar_button_entry.h"
 

modules/entity_spell_system/profiles/actionbar/action_bar_profile.h

@@ -27,19 +27,11 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#include "core/variant/array.h"
-#include "core/variant/dictionary.h"
-#else
 #include "core/reference.h"
 #include "core/vector.h"
 #include "core/ustring.h"
 #include "core/array.h"
 #include "core/dictionary.h"
-#endif
 
 #include "action_bar_entry.h"
 

modules/entity_spell_system/profiles/class_profile.h

@@ -27,15 +27,9 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/string/ustring.h"
-#include "core/variant/dictionary.h"
-#else
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/dictionary.h"
-#endif
 
 #include "actionbar/action_bar_profile.h"
 #include "input/input_profile.h"

modules/entity_spell_system/profiles/input/input_profile.cpp

@@ -24,13 +24,8 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/string/ustring.h"
-#include "core/config/project_settings.h"
-#else
 #include "core/ustring.h"
 #include "core/project_settings.h"
-#endif
 
 #include "../class_profile.h"
 

modules/entity_spell_system/profiles/input/input_profile.h

@@ -22,18 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
-#include "core/version.h"
-
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/string/ustring.h"
-#else
 #include "core/reference.h"
 #include "core/ustring.h"
-#endif
 
 class ClassProfile;
 

modules/entity_spell_system/profiles/input/input_profile_modifier.h

@@ -27,15 +27,9 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#else
 #include "core/reference.h"
 #include "core/vector.h"
 #include "core/ustring.h"
-#endif
 
 #include "input_profile_modifier_entry.h"
 

modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h

@@ -27,13 +27,8 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/string/ustring.h"
-#else
 #include "core/reference.h"
 #include "core/ustring.h"
-#endif
 
 class InputProfileModifierEntry : public Reference {
 	GDCLASS(InputProfileModifierEntry, Reference);

modules/entity_spell_system/profiles/player_profile.h

@@ -27,15 +27,9 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/string/ustring.h"
-#include "core/variant/dictionary.h"
-#else
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/dictionary.h"
-#endif
 
 #include "class_profile.h"
 

modules/entity_spell_system/projectiles/3d/spell_follow_projectile_3d.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "../../defines.h"
 
-#include spatial_h_path
+#include "scene/3d/spatial.h"
 
 class SpellCastInfo;
 

modules/entity_spell_system/singletons/ess.h

@@ -27,19 +27,11 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/config/engine.h"
-#include "core/core_bind.h"
-#include "core/io/resource.h"
-#include "core/object/object.h"
-#include "core/string/ustring.h"
-#else
 #include "core/bind/core_bind.h"
 #include "core/engine.h"
 #include "core/object.h"
 #include "core/resource.h"
 #include "core/ustring.h"
-#endif
 
 #include "scene/main/node.h"
 

modules/entity_spell_system/singletons/profile_manager.cpp

@@ -26,13 +26,8 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/config/engine.h"
-#include "core/config/project_settings.h"
-#else
 #include "core/engine.h"
 #include "core/project_settings.h"
-#endif
 
 #include "../defines.h"
 

modules/entity_spell_system/singletons/profile_manager.h

@@ -27,13 +27,8 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/object.h"
-#include "core/templates/vector.h"
-#else
 #include "core/object.h"
 #include "core/vector.h"
-#endif
 
 #include "../profiles/player_profile.h"
 

modules/entity_spell_system/skeleton/character_bones.h

@@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
 #include "scene/2d/node_2d.h"
 
 class CharacterBones : public Node2D {

modules/entity_spell_system/skeleton/character_skeleton_2d.h

@@ -27,15 +27,9 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#include "core/string/node_path.h"
-#else
 #include "core/vector.h"
 #include "core/ustring.h"
 #include "core/node_path.h"
-#endif
 
 #include "scene/2d/node_2d.h"
 
@@ -51,11 +45,7 @@ SOFTWARE.
 
 #include "../defines.h"
 
-#include spatial_h_path
+#include "scene/3d/spatial.h"
-
-#if GODOT4
-#define Texture Texture2D
-#endif
 
 class ModelVisual;
 

modules/entity_spell_system/skeleton/character_skeleton_3d.h

@@ -27,15 +27,9 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/templates/vector.h"
-#include "core/string/ustring.h"
-#include "core/string/node_path.h"
-#else
 #include "core/vector.h"
 #include "core/ustring.h"
 #include "core/node_path.h"
-#endif
 
 #include "scene/main/node.h"
 
@@ -49,11 +43,7 @@ SOFTWARE.
 
 #include "../defines.h"
 
-#include spatial_h_path
+#include "scene/3d/spatial.h"
-
-#if GODOT4
-#define Texture Texture2D
-#endif
 
 class ModelVisual;
 

modules/entity_spell_system/skeleton/entity_skeleton_data.h

@@ -27,13 +27,10 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/io/resource.h"
-#include "core/string/ustring.h"
-#else
 #include "core/resource.h"
 #include "core/ustring.h"
-#endif
+
+class CharacterSkeletonVisualEntry;
 
 class EntitySkeletonData : public Resource {
 	GDCLASS(EntitySkeletonData, Resource);

modules/entity_spell_system/skeleton/skeleton_model_entry.h

@@ -27,11 +27,7 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#else
 #include "core/reference.h"
-#endif
 
 #include "../data/items/model_visual_entry.h"
 

modules/entity_spell_system/spawners/ess_entity_spawner.h

@@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
-
-
 #include "scene/main/node.h"
 
 #include "scene/main/scene_tree.h"

modules/entity_spell_system/spell_enums.h

@@ -27,12 +27,7 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/object.h"
-#include "core/object/class_db.h"
-#else
 #include "core/object.h"
-#endif
 
 class SpellEnums : public Object {
 	GDCLASS(SpellEnums, Object);

modules/entity_spell_system/utility/entity_create_info.h

@@ -27,13 +27,8 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#if VERSION_MAJOR > 3
-#include "core/object/reference.h"
-#include "core/string/ustring.h"
-#else
 #include "core/reference.h"
 #include "core/ustring.h"
-#endif
 
 #include "../entity_enums.h"