diff --git a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index 81a2a9535..2c04ebb5c 100644 --- a/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -16,7 +16,7 @@ #endif #include "app/linux/Iggy/include/rrCore.h" #include "app/include/SkinBox.h" -#include "util/Definitions.h" +#include "minecraft/world/entity/player/SkinTypes.h" #include "minecraft/client/renderer/Textures.h" class DLCPack; diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index e4372f1d3..f785fb015 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -32,7 +32,7 @@ #include "SharedConstants.h" #include "Timer.h" #include "User.h" -#include "util/Definitions.h" +#include "minecraft/world/entity/player/SkinTypes.h" #include "minecraft/world/level/storage/compression.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index 347f1a14f..3d22b4697 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -23,7 +23,7 @@ #include "app/include/NetTypes.h" #include "MinecraftServer.h" #include "Settings.h" -#include "util/Definitions.h" +#include "minecraft/world/entity/player/SkinTypes.h" #include "java/Class.h" #include "java/JavaMath.h" #include "minecraft/Pos.h" diff --git a/targets/minecraft/world/entity/player/Player.h b/targets/minecraft/world/entity/player/Player.h index 631bca4ff..506f9ff53 100644 --- a/targets/minecraft/world/entity/player/Player.h +++ b/targets/minecraft/world/entity/player/Player.h @@ -8,7 +8,7 @@ #include "platform/PlatformTypes.h" #include "Abilities.h" -#include "util/Definitions.h" +#include "minecraft/world/entity/player/SkinTypes.h" #include "java/Class.h" #include "minecraft/commands/CommandSender.h" #include "minecraft/network/packet/ChatPacket.h" diff --git a/targets/minecraft/world/entity/player/SkinTypes.h b/targets/minecraft/world/entity/player/SkinTypes.h new file mode 100644 index 000000000..a8db7583d --- /dev/null +++ b/targets/minecraft/world/entity/player/SkinTypes.h @@ -0,0 +1,15 @@ +#pragma once + +enum EDefaultSkins { + eDefaultSkins_ServerSelected, + eDefaultSkins_Skin0, + eDefaultSkins_Skin1, + eDefaultSkins_Skin2, + eDefaultSkins_Skin3, + eDefaultSkins_Skin4, + eDefaultSkins_Skin5, + eDefaultSkins_Skin6, + eDefaultSkins_Skin7, + + eDefaultSkins_Count, +}; diff --git a/targets/util/include/util/Definitions.h b/targets/util/include/util/Definitions.h index 6292d8613..db512e514 100644 --- a/targets/util/include/util/Definitions.h +++ b/targets/util/include/util/Definitions.h @@ -8,16 +8,3 @@ enum ByteOrder { LOCALSYSTEM_ENDIAN = LITTLEENDIAN, }; -enum EDefaultSkins { - eDefaultSkins_ServerSelected, - eDefaultSkins_Skin0, - eDefaultSkins_Skin1, - eDefaultSkins_Skin2, - eDefaultSkins_Skin3, - eDefaultSkins_Skin4, - eDefaultSkins_Skin5, - eDefaultSkins_Skin6, - eDefaultSkins_Skin7, - - eDefaultSkins_Count, -};