diff --git a/library/terrain_2d_library_merger.cpp b/library/terrain_2d_library_merger.cpp
index 8136568..259996c 100644
--- a/library/terrain_2d_library_merger.cpp
+++ b/library/terrain_2d_library_merger.cpp
@@ -207,7 +207,7 @@ Rect2 Terrain2DLibraryMerger::get_prop_uv_rect(const Ref<Texture> &texture) {
 		return Rect2(0, 0, 1, 1);
 	}
 
-	Ref<Image> image = tex->get_data();
+	Ref<Image> image = tex->get_image();
 
 	if (!image.is_valid()) {
 		return Rect2(0, 0, 1, 1);
@@ -321,11 +321,8 @@ void Terrain2DLibraryMerger::_setup_material_albedo(const int material_index, co
 Terrain2DLibraryMerger::Terrain2DLibraryMerger() {
 	_packer.instantiate();
 
-#if GODOT4
 #warning implement
-#else
-	_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
-#endif
+	//_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
 
 	_packer->set_max_atlas_size(1024);
 	_packer->set_keep_original_atlases(false);
@@ -333,11 +330,8 @@ Terrain2DLibraryMerger::Terrain2DLibraryMerger() {
 
 	_prop_packer.instantiate();
 
-#if GODOT4
 #warning implement
-#else
-	_prop_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
-#endif
+	//_prop_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
 
 	_prop_packer->set_max_atlas_size(1024);
 	_prop_packer->set_keep_original_atlases(false);
diff --git a/library/terrain_2d_library_merger.h b/library/terrain_2d_library_merger.h
index 8e9bdd6..e755d61 100644
--- a/library/terrain_2d_library_merger.h
+++ b/library/terrain_2d_library_merger.h
@@ -27,7 +27,7 @@ SOFTWARE.
 
 #if VERSION_MAJOR > 3
 #include "core/io/resource.h"
-#include "core/templates/map.h"
+#include "core/templates/hash_map.h"
 #else
 #include "core/resource.h"
 #include "core/map.h"
diff --git a/library/terrain_2d_library_merger_pcm.cpp b/library/terrain_2d_library_merger_pcm.cpp
index c2cae73..b809128 100644
--- a/library/terrain_2d_library_merger_pcm.cpp
+++ b/library/terrain_2d_library_merger_pcm.cpp
@@ -583,7 +583,7 @@ Rect2 Terrain2DLibraryMergerPCM::get_prop_uv_rect(const Ref<Texture> &texture) {
 		return Rect2(0, 0, 1, 1);
 	}
 
-	Ref<Image> image = tex->get_data();
+	Ref<Image> image = tex->get_image();
 
 	if (!image.is_valid()) {
 		return Rect2(0, 0, 1, 1);
@@ -696,11 +696,8 @@ void Terrain2DLibraryMergerPCM::_setup_material_albedo(const int material_index,
 Terrain2DLibraryMergerPCM::Terrain2DLibraryMergerPCM() {
 	_packer.instantiate();
 
-#if GODOT4
 #warning implement
-#else
-	_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
-#endif
+	//_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
 
 	_packer->set_max_atlas_size(1024);
 	_packer->set_keep_original_atlases(false);
@@ -708,11 +705,8 @@ Terrain2DLibraryMergerPCM::Terrain2DLibraryMergerPCM() {
 
 	_prop_packer.instantiate();
 
-#if GODOT4
 #warning implement
-#else
-	_prop_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
-#endif
+	//_prop_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
 
 	_prop_packer->set_max_atlas_size(1024);
 	_prop_packer->set_keep_original_atlases(false);
diff --git a/library/terrain_2d_library_merger_pcm.h b/library/terrain_2d_library_merger_pcm.h
index cff8c87..d55022e 100644
--- a/library/terrain_2d_library_merger_pcm.h
+++ b/library/terrain_2d_library_merger_pcm.h
@@ -27,7 +27,7 @@ SOFTWARE.
 
 #if VERSION_MAJOR > 3
 #include "core/io/resource.h"
-#include "core/templates/map.h"
+#include "core/templates/hash_map.h"
 #else
 #include "core/resource.h"
 #include "core/map.h"
diff --git a/library/terrain_2d_material_cache_pcm.cpp b/library/terrain_2d_material_cache_pcm.cpp
index dc84353..8117d85 100644
--- a/library/terrain_2d_material_cache_pcm.cpp
+++ b/library/terrain_2d_material_cache_pcm.cpp
@@ -172,11 +172,8 @@ void Terrain2DMaterialCachePCM::_setup_material_albedo(Ref<Texture> texture) {
 Terrain2DMaterialCachePCM::Terrain2DMaterialCachePCM() {
 	_packer.instantiate();
 
-#if GODOT4
 #warning implement
-#else
-	_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
-#endif
+	//_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER);
 
 	_packer->set_max_atlas_size(1024);
 	_packer->set_keep_original_atlases(false);
diff --git a/world/default/terrain_2d_chunk_default.cpp b/world/default/terrain_2d_chunk_default.cpp
index f9c7984..077f645 100644
--- a/world/default/terrain_2d_chunk_default.cpp
+++ b/world/default/terrain_2d_chunk_default.cpp
@@ -494,11 +494,11 @@ int Terrain2DChunkDefault::get_light_count() const {
 
 void Terrain2DChunkDefault::debug_mesh_allocate() {
 	if (_debug_mesh_rid == RID()) {
-		_debug_mesh_rid = VisualServer::get_singleton()->mesh_create();
+		_debug_mesh_rid = RenderingServer::get_singleton()->mesh_create();
 	}
 
 	if (_debug_mesh_instance == RID()) {
-		_debug_mesh_instance = VisualServer::get_singleton()->instance_create();
+		_debug_mesh_instance = RenderingServer::get_singleton()->instance_create();
 
 		//if (get_voxel_world()->GET_WORLD().is_valid())
 		//	VS::get_singleton()->instance_set_scenario(_debug_mesh_instance, get_voxel_world()->GET_WORLD()->get_scenario());
@@ -510,11 +510,11 @@ void Terrain2DChunkDefault::debug_mesh_allocate() {
 }
 void Terrain2DChunkDefault::debug_mesh_free() {
 	if (_debug_mesh_instance != RID()) {
-		VisualServer::get_singleton()->free(_debug_mesh_instance);
+		RenderingServer::get_singleton()->free(_debug_mesh_instance);
 	}
 
 	if (_debug_mesh_rid != RID()) {
-		VisualServer::get_singleton()->free(_debug_mesh_rid);
+		RenderingServer::get_singleton()->free(_debug_mesh_rid);
 	}
 }
 bool Terrain2DChunkDefault::debug_mesh_has() {
@@ -522,7 +522,7 @@ bool Terrain2DChunkDefault::debug_mesh_has() {
 }
 void Terrain2DChunkDefault::debug_mesh_clear() {
 	if (_debug_mesh_rid != RID()) {
-		VisualServer::get_singleton()->mesh_clear(_debug_mesh_rid);
+		RenderingServer::get_singleton()->mesh_clear(_debug_mesh_rid);
 	}
 }
 void Terrain2DChunkDefault::debug_mesh_array_clear() {
@@ -545,13 +545,13 @@ void Terrain2DChunkDefault::debug_mesh_send() {
 	SceneTree *st = SceneTree::get_singleton();
 
 	Array arr;
-	arr.resize(VisualServer::ARRAY_MAX);
-	arr[VisualServer::ARRAY_VERTEX] = _debug_mesh_array;
+	arr.resize(RenderingServer::ARRAY_MAX);
+	arr[RenderingServer::ARRAY_VERTEX] = _debug_mesh_array;
 
-	VisualServer::get_singleton()->mesh_add_surface_from_arrays(_debug_mesh_rid, VisualServer::PRIMITIVE_LINES, arr);
+	RenderingServer::get_singleton()->mesh_add_surface_from_arrays(_debug_mesh_rid, RenderingServer::PRIMITIVE_LINES, arr);
 
 	if (st) {
-		VisualServer::get_singleton()->mesh_surface_set_material(_debug_mesh_rid, 0, SceneTree::get_singleton()->get_debug_collision_material()->get_rid());
+		RenderingServer::get_singleton()->mesh_surface_set_material(_debug_mesh_rid, 0, SceneTree::get_singleton()->get_debug_collision_material()->get_rid());
 	}
 
 	debug_mesh_array_clear();
@@ -682,7 +682,7 @@ void Terrain2DChunkDefault::_draw() {
 	setup_canvas_items_size(mesh_rid_get_count(MESH_INDEX_TERRAIN, MESH_TYPE_INDEX_MESH));
 
 	for (int i = 0; i < get_canvas_item_count(); ++i) {
-		VisualServer::get_singleton()->canvas_item_clear(get_canvas_item(i));
+		RenderingServer::get_singleton()->canvas_item_clear(get_canvas_item(i));
 	}
 
 	Terrain2DWorld *world = get_voxel_world();
@@ -695,18 +695,18 @@ void Terrain2DChunkDefault::_draw() {
 		if (terrain_mesh_rid != RID()) {
 			RID terrain_texture_rid = mesh_rid_get(MESH_INDEX_TERRAIN, MESH_TYPE_INDEX_TEXTURE_RID);
 
-			VisualServer::get_singleton()->canvas_item_clear(get_canvas_item(i));
+			RenderingServer::get_singleton()->canvas_item_clear(get_canvas_item(i));
 
 			Transform2D t = get_transform() * _mesh_transforms[i];
 
-			VisualServer::get_singleton()->canvas_item_set_transform(get_canvas_item(i), t);
+			RenderingServer::get_singleton()->canvas_item_set_transform(get_canvas_item(i), t);
 
 			//if (i != 0) {
-			//	VisualServer::get_singleton()->canvas_item_set_custom_rect(get_canvas_item(i), true, Rect2(t.xform(Vector2()), Vector2(128, 128)));
+			//	RenderingServer::get_singleton()->canvas_item_set_custom_rect(get_canvas_item(i), true, Rect2(t.xform(Vector2()), Vector2(128, 128)));
 			//}
 
 			//Note: the transform parameter is not implemented in gles2
-			VisualServer::get_singleton()->canvas_item_add_mesh(get_canvas_item(i), terrain_mesh_rid, Transform2D(), Color(1, 1, 1, 1), terrain_texture_rid, RID());
+			RenderingServer::get_singleton()->canvas_item_add_mesh(get_canvas_item(i), terrain_mesh_rid, Transform2D(), Color(1, 1, 1, 1), terrain_texture_rid, RID());
 		}
 	}
 
@@ -716,7 +716,7 @@ void Terrain2DChunkDefault::_draw() {
 		RID liquid_texture_rid = mesh_rid_get(MESH_INDEX_LIQUID, MESH_TYPE_INDEX_TEXTURE_RID);
 
 		//Note: the transform parameter is not implemented in gles2
-		VisualServer::get_singleton()->canvas_item_add_mesh(get_canvas_item(0), liquid_mesh_rid, Transform2D(), Color(1, 1, 1, 1), liquid_texture_rid, RID());
+		RenderingServer::get_singleton()->canvas_item_add_mesh(get_canvas_item(0), liquid_mesh_rid, Transform2D(), Color(1, 1, 1, 1), liquid_texture_rid, RID());
 	}
 
 	RID prop_mesh_rid = mesh_rid_get(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH);
@@ -725,7 +725,7 @@ void Terrain2DChunkDefault::_draw() {
 		RID prop_texture_rid = mesh_rid_get(MESH_INDEX_PROP, MESH_TYPE_INDEX_TEXTURE_RID);
 
 		//Note: the transform parameter is not implemented in gles2
-		VisualServer::get_singleton()->canvas_item_add_mesh(get_canvas_item(0), prop_mesh_rid, Transform2D(), Color(1, 1, 1, 1), prop_texture_rid, RID());
+		RenderingServer::get_singleton()->canvas_item_add_mesh(get_canvas_item(0), prop_mesh_rid, Transform2D(), Color(1, 1, 1, 1), prop_texture_rid, RID());
 	}
 
 #if TOOLS_ENABLED
@@ -742,24 +742,24 @@ void Terrain2DChunkDefault::_draw() {
 
 	if (debug_shapes) {
 		if (_debug_canvas_item == RID()) {
-			_debug_canvas_item = VisualServer::get_singleton()->canvas_item_create();
+			_debug_canvas_item = RenderingServer::get_singleton()->canvas_item_create();
 
 			if (_voxel_world) {
-				VisualServer::get_singleton()->canvas_item_set_parent(_debug_canvas_item, get_voxel_world()->get_canvas_item());
+				RenderingServer::get_singleton()->canvas_item_set_parent(_debug_canvas_item, get_voxel_world()->get_canvas_item());
 			}
 
-			VisualServer::get_singleton()->canvas_item_set_transform(_debug_canvas_item, get_transform());
-			VisualServer::get_singleton()->canvas_item_set_z_index(_debug_canvas_item, 1);
+			RenderingServer::get_singleton()->canvas_item_set_transform(_debug_canvas_item, get_transform());
+			RenderingServer::get_singleton()->canvas_item_set_z_index(_debug_canvas_item, 1);
 		}
 
-		VisualServer::get_singleton()->canvas_item_clear(_debug_canvas_item);
+		RenderingServer::get_singleton()->canvas_item_clear(_debug_canvas_item);
 
 		Color debug_collision_color = st->get_debug_collisions_color();
 
 		Ref<Shape2D> shape = get_default_tile_shape();
 
 		for (int i = 0; i < _debug_terrain_collider_transforms.size(); ++i) {
-			VisualServer::get_singleton()->canvas_item_add_set_transform(_debug_canvas_item, _debug_terrain_collider_transforms[i]);
+			RenderingServer::get_singleton()->canvas_item_add_set_transform(_debug_canvas_item, _debug_terrain_collider_transforms[i]);
 			shape->draw(_debug_canvas_item, debug_collision_color);
 		}
 	}