From 0f9da6148bfa08bd62251bec578981cc70065eeb Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Mon, 13 Nov 2023 01:41:52 -0500
Subject: [PATCH] (Esimorp I) (Niaga) Dliub Xif Ot Tpmetta

---
 mods/CMakeLists.txt           | 30 +++++++++++++++---------------
 mods/include/mods/init/init.h |  6 +++---
 mods/src/init/init.c          |  2 ++
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/mods/CMakeLists.txt b/mods/CMakeLists.txt
index f8c6876..35e687c 100644
--- a/mods/CMakeLists.txt
+++ b/mods/CMakeLists.txt
@@ -53,14 +53,16 @@ else()
     add_library(multiplayer SHARED src/multiplayer/multiplayer.cpp)
     target_link_libraries(multiplayer mods-headers reborn-patch symbols home feature)
 
+    add_library(benchmark SHARED src/benchmark/benchmark.cpp)
+    target_link_libraries(benchmark mods-headers reborn-patch symbols compat misc media-layer-core)
+endif()
+
+if(NOT MCPI_HEADLESS_MODE)
     add_library(sound SHARED src/sound/sound.cpp src/sound/repository.cpp)
     target_link_libraries(sound mods-headers reborn-patch symbols feature override media-layer-core)
 
     add_library(camera SHARED src/camera/camera.cpp)
-    target_link_libraries(camera mods-headers reborn-patch symbols feature home)
-    if(NOT MCPI_HEADLESS_MODE)
-        target_link_libraries(camera screenshot)
-    endif()
+    target_link_libraries(camera mods-headers reborn-patch symbols feature home screenshot)
 
     add_library(input SHARED src/input/input.cpp src/input/bow.c src/input/attack.c src/input/toggle.c src/input/misc.c src/input/drop.cpp src/input/crafting.cpp)
     target_link_libraries(input mods-headers reborn-patch symbols creative feature misc media-layer-core)
@@ -78,10 +80,10 @@ else()
     target_link_libraries(title-screen mods-headers reborn-patch symbols feature compat)
 
     add_library(skin SHARED src/skin/skin.cpp src/skin/loader.cpp)
-    target_link_libraries(skin mods-headers reborn-patch symbols feature misc textures media-layer-core)
+    target_link_libraries(skin mods-headers reborn-patch symbols feature misc textures media-layer-core stb_image)
 
-    add_library(benchmark SHARED src/benchmark/benchmark.cpp)
-    target_link_libraries(benchmark mods-headers reborn-patch symbols compat misc media-layer-core)
+    add_library(screenshot SHARED src/screenshot/screenshot.c)
+    target_link_libraries(screenshot mods-headers reborn-util media-layer-core stb_image)
 endif()
 
 if(NOT MCPI_HEADLESS_MODE)
@@ -109,11 +111,6 @@ target_link_libraries(options mods-headers reborn-patch symbols feature home)
 add_library(bucket SHARED src/bucket/bucket.cpp)
 target_link_libraries(bucket mods-headers reborn-patch symbols feature misc)
 
-if(NOT MCPI_HEADLESS_MODE)
-    add_library(screenshot SHARED src/screenshot/screenshot.c)
-    target_link_libraries(screenshot mods-headers reborn-util media-layer-core stb_image)
-endif()
-
 add_library(home SHARED src/home/home.c)
 target_link_libraries(home mods-headers reborn-patch symbols)
 
@@ -125,7 +122,10 @@ target_link_libraries(init mods-headers reborn-util compat game-mode misc death
 if(MCPI_SERVER_MODE)
     target_link_libraries(init server)
 else()
-    target_link_libraries(init multiplayer sound camera input sign touch atlas title-screen skin benchmark)
+    target_link_libraries(init multiplayer benchmark)
+endif()
+if(NOT MCPI_HEADLESS_MODE)
+    target_link_libraries(init sound camera input sign touch atlas title-screen skin)
 endif()
 
 ## Install Mods
@@ -133,10 +133,10 @@ set(MODS_TO_INSTALL init compat readdir feature game-mode misc override death op
 if(MCPI_SERVER_MODE)
     list(APPEND MODS_TO_INSTALL server)
 else()
-    list(APPEND MODS_TO_INSTALL multiplayer sound camera input sign touch atlas title-screen skin benchmark)
+    list(APPEND MODS_TO_INSTALL multiplayer benchmark)
 endif()
 if(NOT MCPI_HEADLESS_MODE)
-    list(APPEND MODS_TO_INSTALL screenshot)
+    list(APPEND MODS_TO_INSTALL sound camera input sign touch atlas title-screen skin screenshot)
 endif()
 install(TARGETS ${MODS_TO_INSTALL} DESTINATION "${MCPI_INSTALL_DIR}/mods")
 # SDK
diff --git a/mods/include/mods/init/init.h b/mods/include/mods/init/init.h
index 3ba0fb2..ea7b952 100644
--- a/mods/include/mods/init/init.h
+++ b/mods/include/mods/init/init.h
@@ -13,6 +13,9 @@ void init_compat();
 void init_server();
 #else
 void init_multiplayer();
+void init_benchmark();
+#endif
+#ifndef MCPI_HEADLESS_MODE
 void init_sound();
 void init_input();
 void init_sign();
@@ -31,9 +34,6 @@ void init_options();
 void init_chat();
 void init_bucket();
 void init_home();
-#ifndef MCPI_SERVER_MODE
-void init_benchmark();
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/mods/src/init/init.c b/mods/src/init/init.c
index a89bc1c..86c8638 100644
--- a/mods/src/init/init.c
+++ b/mods/src/init/init.c
@@ -13,6 +13,8 @@ __attribute__((constructor)) static void init() {
     init_server();
 #else
     init_multiplayer();
+#endif
+#ifndef MCPI_HEADLESS_MODE
     init_sound();
     init_input();
     init_sign();