diff --git a/mods/src/chat/chat.cpp b/mods/src/chat/chat.cpp index 85e6727f..b40e48bd 100644 --- a/mods/src/chat/chat.cpp +++ b/mods/src/chat/chat.cpp @@ -5,7 +5,7 @@ #include #include -#include "chat-internal.h" +#include "internal.h" #include #include diff --git a/mods/src/chat/chat-internal.h b/mods/src/chat/internal.h similarity index 100% rename from mods/src/chat/chat-internal.h rename to mods/src/chat/internal.h diff --git a/mods/src/chat/ui.cpp b/mods/src/chat/ui.cpp index c3800825..f5967846 100644 --- a/mods/src/chat/ui.cpp +++ b/mods/src/chat/ui.cpp @@ -1,4 +1,4 @@ -#include "chat-internal.h" +#include "internal.h" #include diff --git a/mods/src/compat/compat.cpp b/mods/src/compat/compat.cpp index 175e52ac..dc124435 100644 --- a/mods/src/compat/compat.cpp +++ b/mods/src/compat/compat.cpp @@ -4,7 +4,7 @@ #include #include -#include "compat-internal.h" +#include "internal.h" // Exit Handler static void exit_handler(__attribute__((unused)) int data) { diff --git a/mods/src/compat/compat-internal.h b/mods/src/compat/internal.h similarity index 100% rename from mods/src/compat/compat-internal.h rename to mods/src/compat/internal.h diff --git a/mods/src/compat/sdl.cpp b/mods/src/compat/sdl.cpp index 4f518927..8b44f232 100644 --- a/mods/src/compat/sdl.cpp +++ b/mods/src/compat/sdl.cpp @@ -10,7 +10,7 @@ #include #include -#include "compat-internal.h" +#include "internal.h" // Custom Title HOOK(media_SDL_WM_SetCaption, void, (__attribute__((unused)) const char *title, const char *icon)) { diff --git a/mods/src/compat/stubs/bcm_host.cpp b/mods/src/compat/stubs/bcm_host.cpp index e7b87fdc..0a83e498 100644 --- a/mods/src/compat/stubs/bcm_host.cpp +++ b/mods/src/compat/stubs/bcm_host.cpp @@ -1,5 +1,5 @@ #include -#include "../compat-internal.h" +#include "../internal.h" // Do Nothing Function static void do_nothing() { diff --git a/mods/src/compat/stubs/egl.cpp b/mods/src/compat/stubs/egl.cpp index 7c9a6f6a..715fdf9a 100644 --- a/mods/src/compat/stubs/egl.cpp +++ b/mods/src/compat/stubs/egl.cpp @@ -2,7 +2,7 @@ #include #include -#include "../compat-internal.h" +#include "../internal.h" // Functions That Have Their Return Values Used static EGLSurface eglCreateWindowSurface_injection(__attribute__((unused)) EGLDisplay display, __attribute__((unused)) EGLConfig config, __attribute__((unused)) NativeWindowType native_window, __attribute__((unused)) EGLint const *attrib_list) { diff --git a/mods/src/compat/stubs/sdl.cpp b/mods/src/compat/stubs/sdl.cpp index e99c78b4..4eb9a371 100644 --- a/mods/src/compat/stubs/sdl.cpp +++ b/mods/src/compat/stubs/sdl.cpp @@ -2,7 +2,7 @@ #include #include -#include "../compat-internal.h" +#include "../internal.h" // SDL Stub static void *SDL_SetVideoMode_injection(__attribute__((unused)) int width, __attribute__((unused)) int height, __attribute__((unused)) int bpp, __attribute__((unused)) uint32_t flags) { diff --git a/mods/src/compat/stubs/x11.cpp b/mods/src/compat/stubs/x11.cpp index 953bbe2c..c2554e39 100644 --- a/mods/src/compat/stubs/x11.cpp +++ b/mods/src/compat/stubs/x11.cpp @@ -2,7 +2,7 @@ #include #include -#include "../compat-internal.h" +#include "../internal.h" // Functions That Have Their Return Values Used static int XTranslateCoordinates_injection(__attribute__((unused)) void *display, __attribute__((unused)) XID src_w, __attribute__((unused)) XID dest_w, int src_x, int src_y, int *dest_x_return, int *dest_y_return, __attribute__((unused)) XID *child_return) { diff --git a/mods/src/extend/DynamicTexture.cpp b/mods/src/extend/DynamicTexture.cpp index 22b257a8..1a0142f7 100644 --- a/mods/src/extend/DynamicTexture.cpp +++ b/mods/src/extend/DynamicTexture.cpp @@ -1,4 +1,4 @@ -#include "extend-internal.h" +#include "internal.h" // VTable SETUP_VTABLE(DynamicTexture) diff --git a/mods/src/extend/Screen.cpp b/mods/src/extend/Screen.cpp index 224918d6..1dae71c7 100644 --- a/mods/src/extend/Screen.cpp +++ b/mods/src/extend/Screen.cpp @@ -1,4 +1,4 @@ -#include "extend-internal.h" +#include "internal.h" // Easily Create Custom Screens void CustomScreen::init() { diff --git a/mods/src/extend/extend-internal.h b/mods/src/extend/internal.h similarity index 100% rename from mods/src/extend/extend-internal.h rename to mods/src/extend/internal.h diff --git a/mods/src/game-mode/game-mode.cpp b/mods/src/game-mode/game-mode.cpp index 53a1a7b3..5893bf3f 100644 --- a/mods/src/game-mode/game-mode.cpp +++ b/mods/src/game-mode/game-mode.cpp @@ -7,7 +7,7 @@ #include #include -#include "game-mode-internal.h" +#include "internal.h" static int is_survival = -1; diff --git a/mods/src/game-mode/game-mode-internal.h b/mods/src/game-mode/internal.h similarity index 100% rename from mods/src/game-mode/game-mode-internal.h rename to mods/src/game-mode/internal.h diff --git a/mods/src/game-mode/ui.cpp b/mods/src/game-mode/ui.cpp index 3c70eeee..6c449d6b 100644 --- a/mods/src/game-mode/ui.cpp +++ b/mods/src/game-mode/ui.cpp @@ -10,7 +10,7 @@ #include #include #include -#include "game-mode-internal.h" +#include "internal.h" // Strings #define GAME_MODE_STR(mode) ("Game Mode: " mode) diff --git a/mods/src/input/attack.cpp b/mods/src/input/attack.cpp index ef3d47f4..5885721a 100644 --- a/mods/src/input/attack.cpp +++ b/mods/src/input/attack.cpp @@ -5,7 +5,7 @@ #include #include -#include "input-internal.h" +#include "internal.h" // Add Attacking To MouseBuildInput #define REMOVE_ATTACK_BAI 0xa diff --git a/mods/src/input/bow.cpp b/mods/src/input/bow.cpp index aaa3bfd5..855fed6a 100644 --- a/mods/src/input/bow.cpp +++ b/mods/src/input/bow.cpp @@ -3,7 +3,7 @@ #include #include -#include "input-internal.h" +#include "internal.h" #include // Store Right-Click Status diff --git a/mods/src/input/drop.cpp b/mods/src/input/drop.cpp index ca19c0a8..dc9c8934 100644 --- a/mods/src/input/drop.cpp +++ b/mods/src/input/drop.cpp @@ -1,6 +1,6 @@ #include -#include "input-internal.h" +#include "internal.h" #include #include #include diff --git a/mods/src/input/input.cpp b/mods/src/input/input.cpp index dca1acec..f1f9afe8 100644 --- a/mods/src/input/input.cpp +++ b/mods/src/input/input.cpp @@ -2,7 +2,7 @@ #include #include -#include "input-internal.h" +#include "internal.h" #include // Init diff --git a/mods/src/input/input-internal.h b/mods/src/input/internal.h similarity index 100% rename from mods/src/input/input-internal.h rename to mods/src/input/internal.h diff --git a/mods/src/input/keys.cpp b/mods/src/input/keys.cpp index c2cd9d19..1a6e9da7 100644 --- a/mods/src/input/keys.cpp +++ b/mods/src/input/keys.cpp @@ -7,7 +7,7 @@ #include -#include "input-internal.h" +#include "internal.h" // Translator static int32_t sdl_key_to_minecraft_key_injection(Common_sdl_key_to_minecraft_key_t original, const int32_t sdl_key) { diff --git a/mods/src/input/misc.cpp b/mods/src/input/misc.cpp index 5b5b7dc2..cccfeec0 100644 --- a/mods/src/input/misc.cpp +++ b/mods/src/input/misc.cpp @@ -3,7 +3,7 @@ #include #include -#include "input-internal.h" +#include "internal.h" #include #include #include diff --git a/mods/src/input/toggle.cpp b/mods/src/input/toggle.cpp index 0205fad0..7aabd049 100644 --- a/mods/src/input/toggle.cpp +++ b/mods/src/input/toggle.cpp @@ -2,7 +2,7 @@ #include -#include "input-internal.h" +#include "internal.h" #include #include #include diff --git a/mods/src/misc/api.cpp b/mods/src/misc/api.cpp index 2cfc3226..839c6997 100644 --- a/mods/src/misc/api.cpp +++ b/mods/src/misc/api.cpp @@ -8,7 +8,7 @@ #include #include -#include "misc-internal.h" +#include "internal.h" // Callbacks template diff --git a/mods/src/misc/graphics.cpp b/mods/src/misc/graphics.cpp index b2db8299..ee83336c 100644 --- a/mods/src/misc/graphics.cpp +++ b/mods/src/misc/graphics.cpp @@ -13,7 +13,7 @@ #include #include -#include "misc-internal.h" +#include "internal.h" // Properly Generate Buffers static void anGenBuffers_injection(__attribute__((unused)) Common_anGenBuffers_t original, const int32_t count, uint32_t *buffers) { diff --git a/mods/src/misc/home.cpp b/mods/src/misc/home.cpp index 3d3ea509..746f8c12 100644 --- a/mods/src/misc/home.cpp +++ b/mods/src/misc/home.cpp @@ -4,7 +4,7 @@ #include -#include "misc-internal.h" +#include "internal.h" // Use MCPI_HOME static const char *getenv_HOME(__attribute__((unused)) const char *env) { diff --git a/mods/src/misc/misc-internal.h b/mods/src/misc/internal.h similarity index 100% rename from mods/src/misc/misc-internal.h rename to mods/src/misc/internal.h diff --git a/mods/src/misc/logging.cpp b/mods/src/misc/logging.cpp index 6b77f60e..4380c219 100644 --- a/mods/src/misc/logging.cpp +++ b/mods/src/misc/logging.cpp @@ -6,7 +6,7 @@ #include -#include "misc-internal.h" +#include "internal.h" #include #include diff --git a/mods/src/misc/misc.cpp b/mods/src/misc/misc.cpp index 0c41069a..a80f6a3d 100644 --- a/mods/src/misc/misc.cpp +++ b/mods/src/misc/misc.cpp @@ -24,7 +24,7 @@ #include #include -#include "misc-internal.h" +#include "internal.h" // Sanitize Username #define MAX_USERNAME_LENGTH 16 diff --git a/mods/src/misc/tinting.cpp b/mods/src/misc/tinting.cpp index c46b2fdd..d0867cb5 100644 --- a/mods/src/misc/tinting.cpp +++ b/mods/src/misc/tinting.cpp @@ -7,7 +7,7 @@ #include #include -#include "misc-internal.h" +#include "internal.h" // Change Grass Color static bool grass_colors_loaded = false; diff --git a/mods/src/misc/ui.cpp b/mods/src/misc/ui.cpp index 62bed5ce..8d1fa897 100644 --- a/mods/src/misc/ui.cpp +++ b/mods/src/misc/ui.cpp @@ -15,7 +15,7 @@ #include #include -#include "misc-internal.h" +#include "internal.h" // Heart Food Overlay static int heal_amount = 0, heal_amount_drawing = 0; diff --git a/mods/src/options/info.cpp b/mods/src/options/info.cpp index 5a6b9461..6bea1e2a 100644 --- a/mods/src/options/info.cpp +++ b/mods/src/options/info.cpp @@ -8,7 +8,7 @@ #include #include -#include "options-internal.h" +#include "internal.h" // Button IDs #define DISCORD_ID 0 diff --git a/mods/src/options/options-internal.h b/mods/src/options/internal.h similarity index 100% rename from mods/src/options/options-internal.h rename to mods/src/options/internal.h diff --git a/mods/src/options/options.cpp b/mods/src/options/options.cpp index 8a3e05ed..a0fbcd0e 100644 --- a/mods/src/options/options.cpp +++ b/mods/src/options/options.cpp @@ -15,7 +15,7 @@ #include #include -#include "options-internal.h" +#include "internal.h" // Force Mob Spawning static bool LevelData_getSpawnMobs_injection(__attribute__((unused)) LevelData_getSpawnMobs_t original, __attribute__((unused)) LevelData *level_data) { diff --git a/mods/src/options/ui.cpp b/mods/src/options/ui.cpp index 1ecff540..b23ffeee 100644 --- a/mods/src/options/ui.cpp +++ b/mods/src/options/ui.cpp @@ -7,7 +7,7 @@ #include -#include "options-internal.h" +#include "internal.h" // Fix Initial Option Button Rendering // The calling function doesn't exist in MCPE v0.6.1, so its name is unknown. diff --git a/mods/src/shading/init.cpp b/mods/src/shading/init.cpp index 5f586127..49d3fb95 100644 --- a/mods/src/shading/init.cpp +++ b/mods/src/shading/init.cpp @@ -1,7 +1,7 @@ #include #include -#include "shading-internal.h" +#include "internal.h" // Init void init_shading() { diff --git a/mods/src/shading/shading-internal.h b/mods/src/shading/internal.h similarity index 100% rename from mods/src/shading/shading-internal.h rename to mods/src/shading/internal.h diff --git a/mods/src/shading/lighting.cpp b/mods/src/shading/lighting.cpp index 5abeb75f..9af9d7f3 100644 --- a/mods/src/shading/lighting.cpp +++ b/mods/src/shading/lighting.cpp @@ -2,7 +2,7 @@ #include #include -#include "shading-internal.h" +#include "internal.h" // OpenGL Lighting static float *get_buffer(const float a, const float b, const float c, const float d) { diff --git a/mods/src/shading/normals.cpp b/mods/src/shading/normals.cpp index 2a2fb31d..1147baa4 100644 --- a/mods/src/shading/normals.cpp +++ b/mods/src/shading/normals.cpp @@ -3,7 +3,7 @@ #include #include -#include "shading-internal.h" +#include "internal.h" // PolygonQuad Vec3 vector_to(const Vec3 &a, const Vec3 &b) { diff --git a/mods/src/shading/tesselator.cpp b/mods/src/shading/tesselator.cpp index 86f20d1e..c39a5ac6 100644 --- a/mods/src/shading/tesselator.cpp +++ b/mods/src/shading/tesselator.cpp @@ -8,7 +8,7 @@ #include #include -#include "shading-internal.h" +#include "internal.h" // Structures struct UV { diff --git a/mods/src/skin/skin-internal.h b/mods/src/skin/internal.h similarity index 100% rename from mods/src/skin/skin-internal.h rename to mods/src/skin/internal.h diff --git a/mods/src/skin/loader.cpp b/mods/src/skin/loader.cpp index 5a9722fb..eb1b39cb 100644 --- a/mods/src/skin/loader.cpp +++ b/mods/src/skin/loader.cpp @@ -12,7 +12,7 @@ #include #include -#include "skin-internal.h" +#include "internal.h" #include "stb_image.h" diff --git a/mods/src/skin/skin.cpp b/mods/src/skin/skin.cpp index ff2e0fd4..32c14135 100644 --- a/mods/src/skin/skin.cpp +++ b/mods/src/skin/skin.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "skin-internal.h" +#include "internal.h" // Change Texture For Player Entities static std::string get_skin_texture_path(const std::string &username) { diff --git a/mods/src/sound/sound-internal.h b/mods/src/sound/internal.h similarity index 100% rename from mods/src/sound/sound-internal.h rename to mods/src/sound/internal.h diff --git a/mods/src/sound/repository.cpp b/mods/src/sound/repository.cpp index 8b9a40d0..872f7503 100644 --- a/mods/src/sound/repository.cpp +++ b/mods/src/sound/repository.cpp @@ -5,7 +5,7 @@ #include #include -#include "sound-internal.h" +#include "internal.h" #include // Sound Repository Extracted From MCPE 0.6.1 APK diff --git a/mods/src/sound/sound.cpp b/mods/src/sound/sound.cpp index fb1686a6..67fc0d40 100644 --- a/mods/src/sound/sound.cpp +++ b/mods/src/sound/sound.cpp @@ -4,7 +4,7 @@ #include #include -#include "sound-internal.h" +#include "internal.h" #include #include #include diff --git a/mods/src/textures/headless.cpp b/mods/src/textures/headless.cpp index 458c1778..e4c9ab13 100644 --- a/mods/src/textures/headless.cpp +++ b/mods/src/textures/headless.cpp @@ -1,7 +1,7 @@ #include #include -#include "textures-internal.h" +#include "internal.h" // Disable Texture Loading static Texture AppPlatform_linux_loadTexture_injection(__attribute__((unused)) AppPlatform_linux_loadTexture_t original, __attribute__((unused)) AppPlatform_linux *app_platform, __attribute__((unused)) const std::string &path, __attribute__((unused)) bool b) { diff --git a/mods/src/textures/textures-internal.h b/mods/src/textures/internal.h similarity index 100% rename from mods/src/textures/textures-internal.h rename to mods/src/textures/internal.h diff --git a/mods/src/textures/lava.cpp b/mods/src/textures/lava.cpp index 72604b40..96abab52 100644 --- a/mods/src/textures/lava.cpp +++ b/mods/src/textures/lava.cpp @@ -5,7 +5,7 @@ #include #include -#include "textures-internal.h" +#include "internal.h" // Lava texture code was originally decompiled by @iProgramMC as part of ReMinecraftPE. // See: https://github.com/ReMinecraftPE/mcpe diff --git a/mods/src/textures/textures.cpp b/mods/src/textures/textures.cpp index 8f68799f..8c8591d3 100644 --- a/mods/src/textures/textures.cpp +++ b/mods/src/textures/textures.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "textures-internal.h" +#include "internal.h" #include "stb_image.h" diff --git a/mods/src/title-screen/title-screen-internal.h b/mods/src/title-screen/internal.h similarity index 100% rename from mods/src/title-screen/title-screen-internal.h rename to mods/src/title-screen/internal.h diff --git a/mods/src/title-screen/splashes.cpp b/mods/src/title-screen/splashes.cpp index e2938adc..f410048e 100644 --- a/mods/src/title-screen/splashes.cpp +++ b/mods/src/title-screen/splashes.cpp @@ -9,7 +9,7 @@ #include #include -#include "title-screen-internal.h" +#include "internal.h" // Load void title_screen_load_splashes(std::vector &splashes) { diff --git a/mods/src/title-screen/title-screen.cpp b/mods/src/title-screen/title-screen.cpp index 923ba27c..1e766d7b 100644 --- a/mods/src/title-screen/title-screen.cpp +++ b/mods/src/title-screen/title-screen.cpp @@ -11,7 +11,7 @@ #include #include -#include "title-screen-internal.h" +#include "internal.h" // Improved Title Screen Background template diff --git a/mods/src/title-screen/welcome.cpp b/mods/src/title-screen/welcome.cpp index 6de870eb..90b58d66 100644 --- a/mods/src/title-screen/welcome.cpp +++ b/mods/src/title-screen/welcome.cpp @@ -11,7 +11,7 @@ #include #include -#include "title-screen-internal.h" +#include "internal.h" // Constants static std::string line1 = "Welcome to " MCPI_APP_TITLE " v" MCPI_VERSION "!";