Undo workaround for compatibility breakage in Godot 4.3, it was rever…

…ted. See godotengine/godot#88379
Joex3 · Feb 24, 2024 · 538be36 · 538be36
1 parent 9c7b4f4
commit 538be36
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 100 deletions.
diff --git a/modifiers/godot/voxel_modifier_gd.cpp b/modifiers/godot/voxel_modifier_gd.cpp
@@ -145,34 +145,17 @@ void VoxelModifier::_notification(int p_what) {
 #ifdef TOOLS_ENABLED
 
 #if defined(ZN_GODOT)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 PackedStringArray VoxelModifier::get_configuration_warnings() const {
 	PackedStringArray warnings;
 	get_configuration_warnings(warnings);
 	return warnings;
 }
-#else
-Array VoxelModifier::get_configuration_warnings() const {
-	PackedStringArray warnings;
-	get_configuration_warnings(warnings);
-	// TODO Eventually make use of new features introduced in Godot 4.3
-	return to_array(warnings);
-}
-#endif
 #elif defined(ZN_GODOT_EXTENSION)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 PackedStringArray VoxelModifier::_get_configuration_warnings() const {
 	PackedStringArray warnings;
 	get_configuration_warnings(warnings);
 	return warnings;
 }
-#else
-Array VoxelModifier::_get_configuration_warnings() const {
-	PackedStringArray warnings;
-	get_configuration_warnings(warnings);
-	return to_array(warnings);
-}
-#endif
 #endif
 
 void VoxelModifier::get_configuration_warnings(PackedStringArray &warnings) const {

diff --git a/modifiers/godot/voxel_modifier_gd.h b/modifiers/godot/voxel_modifier_gd.h
@@ -32,17 +32,9 @@ class VoxelModifier : public Node3D {
 
 #ifdef TOOLS_ENABLED
 #if defined(ZN_GODOT)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 	PackedStringArray get_configuration_warnings() const override;
-#else
-	Array get_configuration_warnings() const override;
-#endif
 #elif defined(ZN_GODOT_EXTENSION)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 	PackedStringArray _get_configuration_warnings() const override;
-#else
-	Array _get_configuration_warnings() const override;
-#endif
 #endif
 	virtual void get_configuration_warnings(PackedStringArray &warnings) const;
 #endif

diff --git a/terrain/fixed_lod/voxel_terrain_multiplayer_synchronizer.cpp b/terrain/fixed_lod/voxel_terrain_multiplayer_synchronizer.cpp
@@ -237,34 +237,17 @@ void VoxelTerrainMultiplayerSynchronizer::_b_receive_area(PackedByteArray messag
 #ifdef TOOLS_ENABLED
 
 #if defined(ZN_GODOT)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 PackedStringArray VoxelTerrainMultiplayerSynchronizer::get_configuration_warnings() const {
 	PackedStringArray warnings;
 	get_configuration_warnings(warnings);
 	return warnings;
 }
-#else
-Array VoxelTerrainMultiplayerSynchronizer::get_configuration_warnings() const {
-	PackedStringArray warnings;
-	get_configuration_warnings(warnings);
-	// TODO Eventually make use of new features introduced in Godot 4.3
-	return to_array(warnings);
-}
-#endif
 #elif defined(ZN_GODOT_EXTENSION)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 PackedStringArray VoxelTerrainMultiplayerSynchronizer::_get_configuration_warnings() const {
 	PackedStringArray warnings;
 	get_configuration_warnings(warnings);
 	return warnings;
 }
-#else
-Array VoxelTerrainMultiplayerSynchronizer::_get_configuration_warnings() const {
-	PackedStringArray warnings;
-	get_configuration_warnings(warnings);
-	return to_array(warnings);
-}
-#endif
 #endif
 
 void VoxelTerrainMultiplayerSynchronizer::get_configuration_warnings(PackedStringArray &warnings) const {

diff --git a/terrain/fixed_lod/voxel_terrain_multiplayer_synchronizer.h b/terrain/fixed_lod/voxel_terrain_multiplayer_synchronizer.h
@@ -27,17 +27,9 @@ class VoxelTerrainMultiplayerSynchronizer : public Node {
 
 #ifdef TOOLS_ENABLED
 #if defined(ZN_GODOT)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 	PackedStringArray get_configuration_warnings() const override;
-#else
-	Array get_configuration_warnings() const override;
-#endif
 #elif defined(ZN_GODOT_EXTENSION)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 	PackedStringArray _get_configuration_warnings() const override;
-#else
-	Array _get_configuration_warnings() const override;
-#endif
 #endif
 	void get_configuration_warnings(PackedStringArray &warnings) const;
 #endif

diff --git a/terrain/instancing/voxel_instancer.cpp b/terrain/instancing/voxel_instancer.cpp
@@ -2016,34 +2016,17 @@ bool VoxelInstancer::debug_get_draw_flag(DebugDrawFlag flag_index) const {
 #ifdef TOOLS_ENABLED
 
 #if defined(ZN_GODOT)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 PackedStringArray VoxelInstancer::get_configuration_warnings() const {
 	PackedStringArray warnings;
 	get_configuration_warnings(warnings);
 	return warnings;
 }
-#else
-Array VoxelInstancer::get_configuration_warnings() const {
-	PackedStringArray warnings;
-	get_configuration_warnings(warnings);
-	// TODO Eventually make use of new features introduced in Godot 4.3
-	return to_array(warnings);
-}
-#endif
 #elif defined(ZN_GODOT_EXTENSION)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 PackedStringArray VoxelInstancer::_get_configuration_warnings() const {
 	PackedStringArray warnings;
 	get_configuration_warnings(warnings);
 	return warnings;
 }
-#else
-Array VoxelInstancer::_get_configuration_warnings() const {
-	PackedStringArray warnings;
-	get_configuration_warnings(warnings);
-	return to_array(warnings);
-}
-#endif
 #endif
 
 void VoxelInstancer::get_configuration_warnings(PackedStringArray &warnings) const {

diff --git a/terrain/instancing/voxel_instancer.h b/terrain/instancing/voxel_instancer.h
@@ -115,17 +115,9 @@ class VoxelInstancer : public Node3D, public VoxelInstanceLibrary::IListener {
 
 #ifdef TOOLS_ENABLED
 #if defined(ZN_GODOT)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 	PackedStringArray get_configuration_warnings() const override;
-#else
-	Array get_configuration_warnings() const override;
-#endif
 #elif defined(ZN_GODOT_EXTENSION)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 	PackedStringArray _get_configuration_warnings() const override;
-#else
-	Array _get_configuration_warnings() const override;
-#endif
 #endif
 	virtual void get_configuration_warnings(PackedStringArray &warnings) const;
 #endif

diff --git a/terrain/voxel_node.cpp b/terrain/voxel_node.cpp
@@ -68,34 +68,17 @@ Ref<VoxelTool> VoxelNode::get_voxel_tool() {
 #ifdef TOOLS_ENABLED
 
 #if defined(ZN_GODOT)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 PackedStringArray VoxelNode::get_configuration_warnings() const {
 	PackedStringArray warnings;
 	get_configuration_warnings(warnings);
 	return warnings;
 }
-#else
-Array VoxelNode::get_configuration_warnings() const {
-	PackedStringArray warnings;
-	get_configuration_warnings(warnings);
-	// TODO Eventually make use of new features introduced in Godot 4.3
-	return to_array(warnings);
-}
-#endif
 #elif defined(ZN_GODOT_EXTENSION)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 PackedStringArray VoxelNode::_get_configuration_warnings() const {
 	PackedStringArray warnings;
 	get_configuration_warnings(warnings);
 	return warnings;
 }
-#else
-Array VoxelNode::_get_configuration_warnings() const {
-	PackedStringArray warnings;
-	get_configuration_warnings(warnings);
-	return to_array(warnings);
-}
-#endif
 #endif
 
 void VoxelNode::get_configuration_warnings(PackedStringArray &warnings) const {

diff --git a/terrain/voxel_node.h b/terrain/voxel_node.h
@@ -48,17 +48,9 @@ class VoxelNode : public Node3D {
 
 #ifdef TOOLS_ENABLED
 #if defined(ZN_GODOT)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 	PackedStringArray get_configuration_warnings() const override;
-#else
-	Array get_configuration_warnings() const override;
-#endif
 #elif defined(ZN_GODOT_EXTENSION)
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR <= 2
 	PackedStringArray _get_configuration_warnings() const override;
-#else
-	Array _get_configuration_warnings() const override;
-#endif
 #endif
 	virtual void get_configuration_warnings(PackedStringArray &warnings) const;
 #endif