diff --git a/resources/[inventory]/qs-inventory/config/vending.lua b/resources/[inventory]/qs-inventory/config/vending.lua index 74fda09a0..c8e6d525b 100644 --- a/resources/[inventory]/qs-inventory/config/vending.lua +++ b/resources/[inventory]/qs-inventory/config/vending.lua @@ -141,6 +141,19 @@ Config.VendingMachines = { }, } }, + ['beer'] = { -- Category: energy + ['Label'] = 'Bier', + ['Items'] = { + [1] = { + ['name'] = 'piรŸwasser', + ['price'] = 10, + ['amount'] = 50, + ['info'] = {}, + ['type'] = 'item', + ['slot'] = 1 + }, + } + }, ['water'] = { -- Category: Water ['Label'] = 'Wasser', ['Items'] = { @@ -205,5 +218,9 @@ Config.Vendings = { ['Model'] = 'prop_vend_fags_01a', -- Cig vending machine ['Category'] = 'cig' -- Linked to cig category }, + [13] = { + ['Model'] = 'bzzz_prop_beer_machine', -- Beer vending machine + ['Category'] = 'cig' -- Linked to cig category + }, } diff --git a/resources/[jobs]/[medic]/visn_are/script/configuration/client_config.lua b/resources/[jobs]/[medic]/visn_are/script/configuration/client_config.lua index a2fe62f66..5ee5e72b0 100644 --- a/resources/[jobs]/[medic]/visn_are/script/configuration/client_config.lua +++ b/resources/[jobs]/[medic]/visn_are/script/configuration/client_config.lua @@ -32,7 +32,7 @@ ClientConfig = { -- control_id: https://docs.fivem.net/docs/game-references/controls/) -- control_key: https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/ - OPEN_SELF_MENU = { enabled = true, control_id = 246, input_parameter = "Y" }, -- Y Key + OPEN_SELF_MENU = { enabled = true, control_id = 246, input_parameter = "Z" }, -- Z Key OPEN_OTHER_MENU = { enabled = true, control_id = 74, input_parameter = "H" }, -- H Key EMERGENCY_DISPATCH = { enabled = true, control_id = 47, input_parameter = "G" }, -- G Key CANCEL_INTERACTION = { enabled = true, control_id = 73, input_parameter = "X" }, -- X Key diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Emote.lua b/resources/[standalone]/rpemotes-reborn-1.8.5/client/Emote.lua deleted file mode 100644 index 5e886f711..000000000 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Emote.lua +++ /dev/null @@ -1,1153 +0,0 @@ --- You probably shouldn't touch these. -local ChosenDict = "" -local ChosenAnimOptions = false -local PlayerGender = "male" -local PlayerProps = {} -local PlayerParticles = {} -local PreviewPedProps = {} -local PtfxNotif = false -local PtfxPrompt = false -local AnimationThreadStatus = false -local CheckStatus = false -local CanCancel = true -local InExitEmote = false -local ExitAndPlay = false -local EmoteCancelPlaying = false -local currentEmote = {} -local attachedProp -IsInAnimation = false -CurrentAnimationName = nil -CurrentTextureVariation = nil -InHandsup = false - --- Remove emotes if needed - -local emoteTypes = { - Shared = '๐Ÿคผ ', - Dances = '', - AnimalEmotes = '๐Ÿถ ', - Emotes = '', - PropEmotes = '๐Ÿ“ฆ ' -} - -for emoteType, prefix in pairs(emoteTypes) do - for emoteName, emoteData in pairs(RP[emoteType]) do - if prefix ~= '' then - emoteData[3] = prefix..emoteData[3] - end - - local shouldRemove = false - - if Config.AdultEmotesDisabled and emoteData.AdultAnimation then - shouldRemove = true - elseif emoteData[1] and not ((emoteData[1] == 'Scenario') or (emoteData[1] == 'ScenarioObject') or (emoteData[1] == 'MaleScenario')) and not DoesAnimDictExist(emoteData[1]) then - shouldRemove = true - end - - if shouldRemove then - RP[emoteType][emoteName] = nil - end - end -end - -if not Config.AnimalEmotesEnabled then - RP.AnimalEmotes = {} -end - -local function RunAnimationThread() - local playerId = PlayerPedId() - if AnimationThreadStatus then return end - AnimationThreadStatus = true - CreateThread(function() - local sleep - while AnimationThreadStatus and (IsInAnimation or PtfxPrompt) do - sleep = 500 - - if IsInAnimation then - sleep = 0 - if IsPlayerAiming(playerId) then - EmoteCancel() - end - if not Config.AllowPunching then - DisableControlAction(2, 140, true) - DisableControlAction(2, 141, true) - DisableControlAction(2, 142, true) - end - end - - if PtfxPrompt and ChosenAnimOptions then - sleep = 0 - if not PtfxNotif then - SimpleNotify(ChosenAnimOptions.PtfxInfo) - PtfxNotif = true - end - if IsControlPressed(0, 47) then - PtfxStart() - Wait(ChosenAnimOptions.PtfxWait) - if ChosenAnimOptions.PtfxCanHold then - while IsControlPressed(0, 47) and IsInAnimation and AnimationThreadStatus do - Wait(5) - end - end - PtfxStop() - end - end - - Wait(sleep) - end - end) -end - -local function CheckStatusThread(dict, anim) - CreateThread(function() - if CheckStatus then - CheckStatus = false - Wait(10) - end - CheckStatus = true - while not IsEntityPlayingAnim(PlayerPedId(), dict, anim, 3) do - Wait(5) - end - while CheckStatus and IsInAnimation do - if not IsEntityPlayingAnim(PlayerPedId(), dict, anim, 3) then - DebugPrint("Animation ended") - DestroyAllProps() - EmoteCancel() - break - end - Wait(0) - end - end) -end - -if Config.EnableCancelKeybind then - RegisterKeyMapping("emotecancel", Translate('register_cancel_emote'), "keyboard", Config.CancelEmoteKey) -end - ------------------------------------------------------------------------------------------------------ --- Commands / Events -------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------ - -CreateThread(function() - TriggerEvent('chat:addSuggestion', '/e', Translate('play_emote'), - { { name = "emotename", help = Translate('help_command') }, - { name = "texturevariation", help = Translate('help_variation') } }) - TriggerEvent('chat:addSuggestion', '/emote', Translate('play_emote'), - { { name = "emotename", help = Translate('help_command') }, - { name = "texturevariation", help = Translate('help_variation') } }) - if Config.Keybinding then - TriggerEvent('chat:addSuggestion', '/emotebind', Translate('link_emote_keybind'), - { { name = "key", help = "num4, num5, num6, num7. num8, num9. Numpad 4-9!" }, - { name = "emotename", help = Translate('help_command') } }) - TriggerEvent('chat:addSuggestion', '/emotebinds', Translate('show_emote_keybind')) - TriggerEvent('chat:addSuggestion', '/emotedelete', Translate('remove_emote_keybind'), - { { name = "key", help = "num4, num5, num6, num7. num8, num9. Numpad 4-9!" } }) - end - TriggerEvent('chat:addSuggestion', '/emotemenu', Translate('open_menu_emote')) - TriggerEvent('chat:addSuggestion', '/emotes', Translate('show_list_emote')) - TriggerEvent('chat:addSuggestion', '/emotecancel', Translate('cancel_emote')) -end) - -RegisterCommand('e', function(source, args, raw) EmoteCommandStart(source, args, raw) end, false) -RegisterCommand('emote', function(source, args, raw) EmoteCommandStart(source, args, raw) end, false) -if Config.Keybinding then - RegisterCommand('emotebind', function(source, args, raw) EmoteBindStart(source, args, raw) end, false) - RegisterCommand('emotebinds', function(source, args, raw) ListKeybinds() end, false) - RegisterCommand('emotedelete', function(source, args) DeleteEmote(args) end, false) -end -if Config.MenuKeybindEnabled then - RegisterCommand('emoteui', function() OpenEmoteMenu() end, false) - RegisterKeyMapping("emoteui", Translate('register_open_menu'), "keyboard", Config.MenuKeybind) -else - RegisterCommand('emotemenu', function() OpenEmoteMenu() end, false) -end -RegisterCommand('emotes', function() EmotesOnCommand() end, false) -RegisterCommand('emotecancel', function() EmoteCancel() end, false) - -local disableHandsupControls = { - [36] = true, -- INPUT_DUCK - [44] = true, -- INPUT_COVER - [53] = true, -- INPUT_WEAPON_SPECIAL - [54] = true, -- INPUT_WEAPON_SPECIAL_TWO - [59] = true, -- INPUT_VEH_MOVE_LR - [60] = true, -- INPUT_VEH_MOVE_UD - [61] = true, -- INPUT_VEH_MOVE_UP_ONLY - [62] = true, -- INPUT_VEH_MOVE_DOWN_ONLY - [63] = true, -- INPUT_VEH_MOVE_LEFT_ONLY - [64] = true, -- INPUT_VEH_MOVE_RIGHT_ONLY - [65] = true, -- INPUT_VEH_SPECIAL - [66] = true, -- INPUT_VEH_GUN_LR - [67] = true, -- INPUT_VEH_GUN_UD - [69] = true, -- INPUT_VEH_ATTACK - [70] = true, -- INPUT_VEH_ATTACK2 - [71] = true, -- INPUT_VEH_ACCELERATE - [72] = true, -- INPUT_VEH_BRAKE - [73] = true, -- INPUT_VEH_DUCK - [74] = true, -- INPUT_VEH_HEADLIGHT - [77] = true, -- INPUT_VEH_HOTWIRE_LEFT - [78] = true, -- INPUT_VEH_HOTWIRE_RIGHT - [80] = true, -- INPUT_VEH_CIN_CAM - [86] = true, -- INPUT_VEH_HORN - [91] = true, -- INPUT_VEH_PASSENGER_AIM - [102] = true, -- INPUT_VEH_JUMP - [104] = true, -- INPUT_VEH_SHUFFLE - [105] = true, -- INPUT_VEH_DROP_PROJECTILE - [136] = true, -- INPUT_VEH_PUSHBIKE_PEDAL - [137] = true, -- INPUT_VEH_PUSHBIKE_SPRINT - [139] = true, -- INPUT_VEH_PUSHBIKE_REAR_BRAKE - [140] = true, -- INPUT_MELEE_ATTACK_LIGHT - [141] = true, -- INPUT_MELEE_ATTACK_HEAVY - [142] = true, -- INPUT_MELEE_ATTACK_ALTERNATE - [143] = true, -- INPUT_MELEE_BLOCK - [337] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_TOGGLE - [338] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_LEFT - [339] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_RIGHT - [340] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_UP - [341] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_DOWN - [342] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_UD - [343] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_LR - [351] = true, -- INPUT_VEH_ROCKET_BOOST - [354] = true, -- INPUT_VEH_BIKE_WINGS - [357] = true, -- INPUT_VEH_TRANSFORM - [345] = true, -- INPUT_VEH_MELEE_HOLD - [346] = true, -- INPUT_VEH_MELEE_LEFT - [347] = true, -- INPUT_VEH_MELEE_RIGHT -} - -local playerId = PlayerId() - -local function HandsUpLoop() - CreateThread(function() - while InHandsup do - if disableHandsupControls then - for control, state in pairs(disableHandsupControls) do - DisableControlAction(0, control, state) - end - end - - if IsPlayerAiming(playerId) then - ClearPedSecondaryTask(PlayerPedId()) - CreateThread(function() - Wait(350) - InHandsup = false - end) - end - - Wait(0) - end - end) -end - -if Config.HandsupEnabled then - local function ToggleHandsUp(commandType) - RegisterCommand(commandType, function() - if IsPedInAnyVehicle(PlayerPedId(), false) and not Config.HandsupKeybindInCarEnabled and not InHandsup then - return - end - Handsup() - end, false) - end - - if Config.HoldToHandsUp then - ToggleHandsUp('+handsup') - ToggleHandsUp('-handsup') - else - ToggleHandsUp('handsup') - end - - function Handsup() - local playerPed = PlayerPedId() - if not IsPedHuman(playerPed) then - return - end - if IsInActionWithErrorMessage() then - return - end - - InHandsup = not InHandsup - if InHandsup then - LocalPlayer.state:set('currentEmote', 'handsup', true) - DestroyAllProps() - local dict = "random@mugging3" - RequestAnimDict(dict) - while not HasAnimDictLoaded(dict) do - Wait(0) - end - TaskPlayAnim(PlayerPedId(), dict, "handsup_standing_base", 3.0, 3.0, -1, 49, 0, false, - IsThisModelABike(GetEntityModel(GetVehiclePedIsIn(PlayerPedId(), false))) and 4127 or false, false) - HandsUpLoop() - else - LocalPlayer.state:set('currentEmote', nil, true) - ClearPedSecondaryTask(PlayerPedId()) - if Config.PersistentEmoteAfterHandsup and IsInAnimation then - local emote = RP.Emotes[CurrentAnimationName] or RP.PropEmotes[CurrentAnimationName] or RP.Dances[CurrentAnimationName] or RP.AnimalEmotes[CurrentAnimationName] - if not emote then - return - end - - Wait(400) - DestroyAllProps() - OnEmotePlay(emote, CurrentAnimationName, CurrentTextureVariation) - end - end - end - - TriggerEvent('chat:addSuggestion', '/handsup', Translate('handsup')) - - if Config.HandsupKeybindEnabled then - RegisterKeyMapping("handsup", Translate('register_handsup'), "keyboard", Config.HandsupKeybind) - end - - local function IsPlayerInHandsUp() - return InHandsup - end - - exports('IsPlayerInHandsUp', IsPlayerInHandsUp) -end - -AddEventHandler('onResourceStop', function(resource) - if resource == GetCurrentResourceName() then - local ped = PlayerPedId() - ClosePedMenu() - DestroyAllProps() - ClearPedTasksImmediately(ped) - DetachEntity(ped, true, false) - ResetPedMovementClipset(ped, 0.8) - end -end) - ------------------------------------------------------------------------------------------------------ ------- Functions and stuff -------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------ -local scenarioObjects = { - `p_amb_coffeecup_01`, - `p_amb_joint_01`, - `p_cs_ciggy_01`, - `p_cs_ciggy_01b_s`, - `p_cs_clipboard`, - `prop_curl_bar_01`, - `p_cs_joint_01`, - `p_cs_joint_02`, - `prop_acc_guitar_01`, - `prop_amb_ciggy_01`, - `prop_amb_phone`, - `prop_beggers_sign_01`, - `prop_beggers_sign_02`, - `prop_beggers_sign_03`, - `prop_beggers_sign_04`, - `prop_bongos_01`, - `prop_cigar_01`, - `prop_cigar_02`, - `prop_cigar_03`, - `prop_cs_beer_bot_40oz_02`, - `prop_cs_paper_cup`, - `prop_cs_trowel`, - `prop_fib_clipboard`, - `prop_fish_slice_01`, - `prop_fishing_rod_01`, - `prop_fishing_rod_02`, - `prop_notepad_02`, - `prop_parking_wand_01`, - `prop_rag_01`, - `prop_scn_police_torch`, - `prop_sh_cigar_01`, - `prop_sh_joint_01`, - `prop_tool_broom`, - `prop_tool_hammer`, - `prop_tool_jackham`, - `prop_tennis_rack_01`, - `prop_weld_torch`, - `w_me_gclub`, - `p_amb_clipboard_01` -} - -local function cleanScenarioObjects(isClone) - local ped = isClone and ClonedPed or PlayerPedId() - local playerCoords = GetEntityCoords(ped) - - for i = 1, #scenarioObjects do - local deleteScenarioObject = GetClosestObjectOfType(playerCoords.x, playerCoords.y, playerCoords.z, 1.0, - scenarioObjects[i], false, true, true) - if DoesEntityExist(deleteScenarioObject) then - SetEntityAsMissionEntity(deleteScenarioObject, false, false) - DeleteObject(deleteScenarioObject) - end - end -end - -function EmoteCancel(force) - LocalPlayer.state:set('currentEmote', nil, true) - EmoteCancelPlaying = true - -- Don't cancel if we are in an exit emote - if InExitEmote then - return - end - - local ped = PlayerPedId() - if not CanCancel and force ~= true then return end - if ChosenDict == "MaleScenario" and IsInAnimation then - ClearPedTasksImmediately(ped) - IsInAnimation = false - DebugPrint("Forced scenario exit") - elseif ChosenDict == "Scenario" and IsInAnimation then - ClearPedTasksImmediately(ped) - IsInAnimation = false - DebugPrint("Forced scenario exit") - end - - PtfxNotif = false - PtfxPrompt = false - Pointing = false - - if IsInAnimation then - if LocalPlayer.state.ptfx then - PtfxStop() - end - DetachEntity(ped, true, false) - CancelSharedEmote() - - if ChosenAnimOptions and ChosenAnimOptions.ExitEmote then - -- If the emote exit type is not specified, it defaults to Emotes - local options = ChosenAnimOptions - local ExitEmoteType = options.ExitEmoteType or "Emotes" - - -- Checks that the exit emote actually exists - if not RP[ExitEmoteType] or not RP[ExitEmoteType][options.ExitEmote] then - DebugPrint("Exit emote was invalid") - IsInAnimation = false - ClearPedTasks(ped) - return - end - OnEmotePlay(RP[ExitEmoteType][options.ExitEmote], ExitEmoteType) - DebugPrint("Playing exit animation") - - -- Check that the exit emote has a duration, and if so, set InExitEmote variable - local animationOptions = RP[ExitEmoteType][options.ExitEmote].AnimationOptions - if animationOptions and animationOptions.EmoteDuration then - InExitEmote = true - SetTimeout(animationOptions.EmoteDuration, function() - InExitEmote = false - DestroyAllProps() - ClearPedTasks(ped) - EmoteCancelPlaying = false - end) - return - end - else - IsInAnimation = false - ClearPedTasks(ped) - EmoteCancelPlaying = false - end - DestroyAllProps() - end - cleanScenarioObjects(false) - AnimationThreadStatus = false - CheckStatus = false -end - -function PtfxThis(asset) - while not HasNamedPtfxAssetLoaded(asset) do - RequestNamedPtfxAsset(asset) - Wait(10) - end - UseParticleFxAsset(asset) -end - -function PtfxStart() - LocalPlayer.state:set('ptfx', true, true) -end - -function PtfxStop() - LocalPlayer.state:set('ptfx', false, true) -end - -AddStateBagChangeHandler('ptfx', '', function(bagName, key, value, _unused, replicated) - local plyId = tonumber(bagName:gsub('player:', ''), 10) - - -- We stop here if we don't need to go further - -- We don't need to start or stop the ptfx twice - if (PlayerParticles[plyId] and value) or (not PlayerParticles[plyId] and not value) then return end - - -- Only allow ptfx change on players - local ply = GetPlayerFromServerId(plyId) - if ply == 0 then return end - - local plyPed = GetPlayerPed(ply) - if not DoesEntityExist(plyPed) then return end - - local stateBag = Player(plyId).state - - if value then - -- Start ptfx - - local asset = stateBag.ptfxAsset - local name = stateBag.ptfxName - local offset = stateBag.ptfxOffset - local rot = stateBag.ptfxRot - local boneIndex = stateBag.ptfxBone and GetPedBoneIndex(plyPed, stateBag.ptfxBone) or - GetEntityBoneIndexByName(name, "VFX") - local scale = stateBag.ptfxScale or 1 - local color = stateBag.ptfxColor - local propNet = stateBag.ptfxPropNet - local entityTarget = plyPed - - if propNet then - local propObj = NetToObj(propNet) - if DoesEntityExist(propObj) then - entityTarget = propObj - end - end - PtfxThis(asset) - PlayerParticles[plyId] = StartNetworkedParticleFxLoopedOnEntityBone(name, entityTarget, offset.x, offset.y, - offset.z, rot.x, rot.y, rot.z, boneIndex, scale + 0.0, false, false, false) - if color then - if color[1] and type(color[1]) == 'table' then - local randomIndex = math.random(1, #color) - color = color[randomIndex] - end - SetParticleFxLoopedAlpha(PlayerParticles[plyId], color.A) - SetParticleFxLoopedColour(PlayerParticles[plyId], color.R / 255, color.G / 255, color.B / 255, false) - end - DebugPrint("Started PTFX: " .. PlayerParticles[plyId]) - else - DebugPrint("Stopped PTFX: " .. PlayerParticles[plyId]) - StopParticleFxLooped(PlayerParticles[plyId], false) - RemoveNamedPtfxAsset(stateBag.ptfxAsset) - PlayerParticles[plyId] = nil - end -end) - -function EmotesOnCommand(source, args, raw) - local EmotesCommand = "" - for a in PairsByKeys(RP.Emotes) do - EmotesCommand = EmotesCommand .. "" .. a .. ", " - end - EmoteChatMessage(EmotesCommand) - EmoteChatMessage(Translate('emotemenucmd')) -end - -function EmoteMenuStart(name, category, textureVariation) - if category == "dances" then - if RP.Dances[name] ~= nil then - OnEmotePlay(RP.Dances[name], name) - end - elseif category == "animals" then - if RP.AnimalEmotes[name] ~= nil then - CheckAnimalAndOnEmotePlay(RP.AnimalEmotes[name], name) - end - elseif category == "props" then - if RP.PropEmotes[name] ~= nil then - OnEmotePlay(RP.PropEmotes[name], name, textureVariation) - end - elseif category == "emotes" then - if RP.Emotes[name] ~= nil then - OnEmotePlay(RP.Emotes[name], name) - end - elseif category == "expression" then - if RP.Expressions[name] ~= nil then - SetPlayerPedExpression(RP.Expressions[name][1], true) - end - end -end - -function EmoteMenuStartClone(name, category) - if category == "dances" then - if RP.Dances[name] then - OnEmotePlayClone(RP.Dances[name]) - end - elseif category == "props" then - if RP.PropEmotes[name] then - OnEmotePlayClone(RP.PropEmotes[name]) - end - elseif category == "emotes" then - if RP.Emotes[name] then - OnEmotePlayClone(RP.Emotes[name]) - end - elseif category == "expression" then - if RP.Expressions[name] then - SetFacialIdleAnimOverride(ClonedPed, RP.Expressions[name][1], 0) - end - end -end - -function EmoteCommandStart(source, args, raw) - if #args > 0 then - if IsEntityDead(PlayerPedId()) or IsPedRagdoll(PlayerPedId()) or IsPedGettingUp(PlayerPedId()) or IsPedInMeleeCombat(PlayerPedId()) then - TriggerEvent('chat:addMessage', { - color = { 255, 0, 0 }, - multiline = true, - args = { "RPEmotes", Translate('dead') } - }) - return - end - if (IsPedSwimming(PlayerPedId()) or IsPedSwimmingUnderWater(PlayerPedId())) and not Config.AllowInWater then - TriggerEvent('chat:addMessage', { - color = { 255, 0, 0 }, - multiline = true, - args = { "RPEmotes", Translate('swimming') } - }) - return - end - local name = string.lower(args[1]) - if name == "c" then - if IsInAnimation then - EmoteCancel() - else - EmoteChatMessage(Translate('nocancel')) - end - return - elseif name == "help" then - EmotesOnCommand() - return - end - - local emote = RP.Emotes[name] or RP.Dances[name] or RP.AnimalEmotes[name] or RP.PropEmotes[name] or RP.Expressions[name] or RP.Exits[name] - if emote then - if RP.AnimalEmotes[name] then - if Config.AnimalEmotesEnabled then - CheckAnimalAndOnEmotePlay(RP.AnimalEmotes[name], name) - else - EmoteChatMessage(Translate('animaldisabled')) - end - return - end - - if RP.PropEmotes[name] and RP.PropEmotes[name].AnimationOptions.PropTextureVariations then - if #args > 1 then - local textureVariation = tonumber(args[2]) - if (RP.PropEmotes[name].AnimationOptions.PropTextureVariations[textureVariation] ~= nil) then - OnEmotePlay(RP.PropEmotes[name], name, textureVariation - 1) - return - else - local str = "" - for k, v in ipairs(RP.PropEmotes[name].AnimationOptions.PropTextureVariations) do - str = str .. string.format("\n(%s) - %s", k, v.Name) - end - - EmoteChatMessage(string.format(Translate('invalidvariation'), str), true) - OnEmotePlay(RP.PropEmotes[name], name, 0) - return - end - end - end - - OnEmotePlay(emote, name) - else - EmoteChatMessage("'" .. name .. "' " .. Translate('notvalidemote') .. "") - end - end -end - -function CheckAnimalAndOnEmotePlay(emoteData, name) - local playerPed = PlayerPedId() - local isValidPet = false - - if string.sub(name, 1, 4) == "bdog" then - for _, model in ipairs(BigDogs) do - if IsPedModel(playerPed, GetHashKey(model)) then - isValidPet = true - break - end - end - elseif string.sub(name, 1, 4) == "sdog" then - for _, model in ipairs(SmallDogs) do - if IsPedModel(playerPed, GetHashKey(model)) then - isValidPet = true - break - end - end - end - - if isValidPet then - OnEmotePlay(emoteData, name) - else - EmoteChatMessage(Translate('notvalidpet')) - end -end - ----@param isClone boolean | nil -function DestroyAllProps(isClone) - if isClone then - for _, v in pairs(PreviewPedProps) do - DeleteEntity(v) - end - PreviewPedProps = {} - else - for _, v in pairs(PlayerProps) do - DeleteEntity(v) - end - PlayerProps = {} - end - DebugPrint("Destroyed Props for " .. (isClone and "clone" or "player")) -end - -function AddProp(prop1, bone, off1, off2, off3, rot1, rot2, rot3, textureVariation, isClone) - local target = isClone and ClonedPed or PlayerPedId() - - local x, y, z = table.unpack(GetEntityCoords(target)) - - if not IsModelValid(prop1) then - DebugPrint(tostring(prop1) .. " is not a valid model!") - return false - end - - if not HasModelLoaded(prop1) then - LoadPropDict(prop1) - end - - - attachedProp = CreateObject(joaat(prop1), x, y, z + 0.2, not isClone, true, true) - - if textureVariation ~= nil then - SetObjectTextureVariation(attachedProp, textureVariation) - end - - - if isClone then - AttachEntityToEntity(attachedProp, target, GetPedBoneIndex(target, bone), off1, off2, off3, rot1, rot2, rot3, - true, true, false, true, 1, true) - table.insert(PreviewPedProps, attachedProp) - else - AttachEntityToEntity(attachedProp, target, GetPedBoneIndex(target, bone), off1, off2, off3, rot1, rot2, rot3, - true, true, false, true, 1, true) - table.insert(PlayerProps, attachedProp) - end - - - SetModelAsNoLongerNeeded(prop1) - DebugPrint("Added prop to " .. (isClone and "clone" or "player")) - return true -end - -function CheckGender() - local playerPed = PlayerPedId() - - if GetEntityModel(playerPed) == joaat("mp_f_freemode_01") then - PlayerGender = "female" - else - PlayerGender = "male" - end - - DebugPrint("Set gender as = (" .. PlayerGender .. ")") -end - -function OnEmotePlay(emoteData, name, textureVariation) - if not LocalPlayer.state.canEmote then return end - - cleanScenarioObjects(false) - - InVehicle = IsPedInAnyVehicle(PlayerPedId(), true) - Pointing = false - - if not Config.AllowedInCars and InVehicle then - return - end - - if not DoesEntityExist(PlayerPedId()) then - return false - end - - if Config.AdultEmotesDisabled and emoteData.AdultAnimation then - return EmoteChatMessage(Translate('adultemotedisabled')) - end - - if InExitEmote then - return false - end - - if Config.CancelPreviousEmote and IsInAnimation and not ExitAndPlay and not EmoteCancelPlaying then - ExitAndPlay = true - DebugPrint("Canceling previous emote and playing next emote") - PlayExitAndEnterEmote(emoteData, name, textureVariation) - return - end - - - local animOption = emoteData.AnimationOptions - if InVehicle then - if animOption and animOption.NotInVehicle then - return EmoteChatMessage(Translate('not_in_a_vehicle')) - end - elseif animOption and animOption.onlyInVehicle then - return EmoteChatMessage(Translate('in_a_vehicle')) - end - - if ChosenAnimOptions?.ExitEmote and animOption and animOption.ExitEmote then - if not (animOption and ChosenAnimOptions.ExitEmote == animOption.ExitEmote) and RP.Exits[ChosenAnimOptions.ExitEmote][2] ~= emoteData[2] then - return - end - end - - if IsInActionWithErrorMessage() then - return false - end - - ChosenDict = emoteData[1] - local anim = emoteData[2] - CurrentAnimationName = name - LocalPlayer.state:set('currentEmote', name, true) - CurrentTextureVariation = textureVariation - ChosenAnimOptions = animOption - - if Config.DisarmPlayer then - if IsPedArmed(PlayerPedId(), 7) then - SetCurrentPedWeapon(PlayerPedId(), joaat('WEAPON_UNARMED'), true) - end - end - - if animOption and animOption.Prop then - DestroyAllProps() - end - - if ChosenDict == "MaleScenario" or ChosenDict == "Scenario" or ChosenDict == "ScenarioObject" then - if InVehicle then return end - CheckGender() - ClearPedTasks(PlayerPedId()) - DestroyAllProps() - if ChosenDict == "MaleScenario" then - if PlayerGender == "male" then - TaskStartScenarioInPlace(PlayerPedId(), anim, 0, true) - DebugPrint("Playing scenario = (" .. anim .. ")") - else - EmoteCancel() - EmoteChatMessage(Translate('maleonly')) - return - end - elseif ChosenDict == "ScenarioObject" then - local BehindPlayer = GetOffsetFromEntityInWorldCoords(PlayerPedId(), 0.0, -0.5, -0.5) - TaskStartScenarioAtPosition(PlayerPedId(), anim, BehindPlayer.x, BehindPlayer.y, BehindPlayer.z, GetEntityHeading(PlayerPedId()), 0, true, false) - DebugPrint("Playing scenario = (" .. anim .. ")") - else - TaskStartScenarioInPlace(PlayerPedId(), anim, 0, true) - DebugPrint("Playing scenario = (" .. anim .. ")") - end - IsInAnimation = true - RunAnimationThread() - return - end - - -- Small delay at the start - if animOption and animOption.StartDelay then - Wait(animOption.StartDelay) - end - - if not LoadAnim(ChosenDict) then - EmoteChatMessage("'" .. name .. "' " .. Translate('notvalidemote') .. "") - return - end - - local movementType = 0 -- Default movement type - - if InVehicle then - if animOption and animOption.FullBody then - movementType = 35 - else - movementType = 51 - end - elseif animOption then - if animOption.EmoteMoving then - movementType = 51 - elseif animOption.EmoteLoop then - movementType = 1 - elseif animOption.EmoteStuck then - movementType = 50 - end - end - - DebugPrint("Animation flag = (" .. movementType .. ")") - - if animOption then - if animOption.PtfxAsset then - Ptfx1, Ptfx2, Ptfx3, Ptfx4, Ptfx5, Ptfx6, PtfxScale = table.unpack(animOption.PtfxPlacement) - PtfxNotif = false - PtfxPrompt = true - RunAnimationThread() - TriggerServerEvent("rpemotes:ptfx:sync", animOption.PtfxAsset, animOption.PtfxName, vector3(Ptfx1, Ptfx2, Ptfx3), - vector3(Ptfx4, Ptfx5, Ptfx6), animOption.PtfxBone, PtfxScale, animOption.PtfxColor) - else - PtfxPrompt = false - end - end - - if IsPedUsingAnyScenario(PlayerPedId()) or IsPedActiveInScenario(PlayerPedId()) then - ClearPedTasksImmediately(PlayerPedId()) - end - - TaskPlayAnim(PlayerPedId(), ChosenDict, anim, animOption?.BlendInSpeed or 5.0, animOption?.BlendOutSpeed or 5.0, animOption?.EmoteDuration or -1, movementType, 0, false, false, - false) - RemoveAnimDict(ChosenDict) - - IsInAnimation = true - RunAnimationThread() - - if not (animOption and animOption.Prop) then - CheckStatusThread(ChosenDict, anim) - end - - local currentEmoteTable = emoteData - for _, tabledata in pairs(RP) do - for command, emotedata in pairs(tabledata) do - if emotedata == emoteData then - table.insert(currentEmoteTable, command) - break - end - end - end - currentEmote = currentEmoteTable - - if animOption and animOption.Prop then - PropPl1, PropPl2, PropPl3, PropPl4, PropPl5, PropPl6 = table.unpack(animOption.PropPlacement) - - Wait(animOption and animOption.EmoteDuration or 0) - - if not AddProp(animOption.Prop, animOption.PropBone, PropPl1, PropPl2, PropPl3, PropPl4, PropPl5, PropPl6, textureVariation, false) then return end - - if animOption.SecondProp then - SecondPropPl1, SecondPropPl2, SecondPropPl3, SecondPropPl4, SecondPropPl5, SecondPropPl6 = table.unpack(animOption.SecondPropPlacement) - if not AddProp(animOption.SecondProp, animOption.SecondPropBone, SecondPropPl1, SecondPropPl2, SecondPropPl3, SecondPropPl4, SecondPropPl5, SecondPropPl6, textureVariation, false) then - DestroyAllProps() - return - end - end - - -- Ptfx is on the prop, then we need to sync it - if not animOption then return end - if animOption.PtfxAsset and not animOption.PtfxNoProp then - TriggerServerEvent("rpemotes:ptfx:syncProp", ObjToNet(attachedProp)) - end - end -end - -function OnEmotePlayClone(emoteData) - if not Config.PreviewPed then return end - - cleanScenarioObjects(true) - - if not DoesEntityExist(ClonedPed) then - return false - end - - if InExitEmote then - return false - end - - if Config.CancelPreviousEmote and not ExitAndPlay and not EmoteCancelPlaying then - ExitAndPlay = true - DebugPrint("Canceling previous emote and playing next emote") - return - end - - local animOption = emoteData.AnimationOptions - - local dict, anim = table.unpack(emoteData) - - if animOption and animOption.Prop then - DestroyAllProps(true) - end - - if dict == "MaleScenario" or dict == "Scenario" or dict == "ScenarioObject" then - CheckGender() - ClearPedTasks(ClonedPed) - DestroyAllProps(true) - if dict == "MaleScenario" then - if PlayerGender == "male" then - TaskStartScenarioInPlace(ClonedPed, anim, 0, true) - end - elseif dict == "ScenarioObject" then - local BehindPlayer = GetOffsetFromEntityInWorldCoords(ClonedPed, 0.0, -0.5, -0.5) - TaskStartScenarioAtPosition(ClonedPed, anim, BehindPlayer.x, BehindPlayer.y, BehindPlayer.z, GetEntityHeading(ClonedPed), 0, true, false) - elseif dict == "Scenario" then - TaskStartScenarioInPlace(ClonedPed, anim, 0, true) - end - return - end - - if not LoadAnim(dict) then - EmoteChatMessage("'" .. ename .. "' " .. Translate('notvalidemote') .. "") - return - end - - local movementType = 0 -- Default movement type - - if animOption then - if animOption.EmoteMoving then - movementType = 51 - elseif animOption.EmoteLoop then - movementType = 1 - elseif animOption.EmoteStuck then - movementType = 50 - end - end - - if IsPedUsingAnyScenario(ClonedPed) or IsPedActiveInScenario(ClonedPed) then - ClearPedTasksImmediately(ClonedPed) - end - - TaskPlayAnim(ClonedPed, dict, anim, 5.0, 5.0, animOption and animOption.EmoteDuration or -1, movementType, 0, false, false, false) - RemoveAnimDict(dict) - - if animOption and animOption.Prop then - local PropPl1, PropPl2, PropPl3, PropPl4, PropPl5, PropPl6 = table.unpack(animOption.PropPlacement) - - Wait(animOption and animOption.EmoteDuration or 0) - - if not AddProp(animOption.Prop, animOption.PropBone, PropPl1, PropPl2, PropPl3, PropPl4, PropPl5, PropPl6, nil, true) then return end - - if animOption.SecondProp then - local SecondPropPl1, SecondPropPl2, SecondPropPl3, SecondPropPl4, SecondPropPl5, SecondPropPl6 = table.unpack(animOption.SecondPropPlacement) - - if not AddProp(animOption.SecondProp, animOption.SecondPropBone, SecondPropPl1, SecondPropPl2, SecondPropPl3, SecondPropPl4, SecondPropPl5, SecondPropPl6, nil, true) then - DestroyAllProps(true) - return - end - end - end -end - -function PlayExitAndEnterEmote(emoteName, name, textureVariation) - local ped = PlayerPedId() - if not CanCancel then return end - if ChosenDict == "MaleScenario" and IsInAnimation then - ClearPedTasksImmediately(ped) - IsInAnimation = false - DebugPrint("Forced scenario exit") - elseif ChosenDict == "Scenario" and IsInAnimation then - ClearPedTasksImmediately(ped) - IsInAnimation = false - DebugPrint("Forced scenario exit") - end - - PtfxNotif = false - PtfxPrompt = false - Pointing = false - - if LocalPlayer.state.ptfx then - PtfxStop() - end - DetachEntity(ped, true, false) - CancelSharedEmote() - - if ChosenAnimOptions?.ExitEmote then - -- If the emote exit type is not spesifed it defaults to Emotes - local options = ChosenAnimOptions - local ExitEmoteType = options.ExitEmoteType or "Emotes" - - -- Checks that the exit emote actually exists - if not RP[ExitEmoteType] or not RP[ExitEmoteType][options.ExitEmote] then - DebugPrint("Exit emote was invalid") - ClearPedTasks(ped) - IsInAnimation = false - return - end - OnEmotePlay(RP[ExitEmoteType][options.ExitEmote], ExitEmoteType) - DebugPrint("Playing exit animation") - - -- Check that the exit emote has a duration, and if so, set InExitEmote variable - local animationOptions = RP[ExitEmoteType][options.ExitEmote].AnimationOptions - if animationOptions and animationOptions.EmoteDuration then - InExitEmote = true - SetTimeout(animationOptions.EmoteDuration, function() - InExitEmote = false - DestroyAllProps(true) - ClearPedTasks(ped) - OnEmotePlay(emoteName, name, textureVariation) - ExitAndPlay = false - end) - return - end - else - ClearPedTasks(ped) - IsInAnimation = false - ExitAndPlay = false - DestroyAllProps(true) - OnEmotePlay(emoteName, name, CurrentTextureVariation) - end -end - -exports("EmoteCommandStart", function(emoteName, textureVariation) - EmoteCommandStart(nil, { emoteName, textureVariation }, nil) -end) -exports("EmoteCancel", EmoteCancel) -exports("CanCancelEmote", function(State) - CanCancel = State == true -end) -exports('IsPlayerInAnim', function() - return LocalPlayer.state.currentEmote -end) -exports('getCurrentEmote', function() - return currentEmote -end) - --- Door stuff -local openingDoor = false -AddEventHandler('CEventOpenDoor', function(unk1) - if unk1[1] ~= PlayerPedId() then return end - if ShowPed then - return - end - - if not IsInAnimation then - return - end - - if openingDoor then - return - end - - openingDoor = true - - while IsPedOpeningADoor(PlayerPedId()) do - Wait(100) - end - - openingDoor = false - - Wait(200) - - local emote = RP.Emotes[CurrentAnimationName] or RP.PropEmotes[CurrentAnimationName] or RP.Dances[CurrentAnimationName] or RP.AnimalEmotes[CurrentAnimationName] - if not emote then - return - end - - ClearPedTasks(PlayerPedId()) - DestroyAllProps() - OnEmotePlay(emote, CurrentAnimationName, CurrentTextureVariation) -end) - -local isBumpingPed = false -local timeout = 500 - -AddEventHandler("CEventPlayerCollisionWithPed", function(unk1) - if unk1[1] ~= PlayerPedId() then return end - if not IsInAnimation then - return - end - - if isBumpingPed then - timeout = 500 - return - end - isBumpingPed = true - timeout = 500 - -- We wait a bit to avoid collision with the ped resetting the animation again - - while timeout > 0 do - Wait(100) - timeout = timeout - 100 - end - - if not IsInAnimation then - return - end - - local emote = RP.Emotes[CurrentAnimationName] or RP.PropEmotes[CurrentAnimationName] or RP.Dances[CurrentAnimationName] or RP.AnimalEmotes[CurrentAnimationName] - if not emote then - return - end - - isBumpingPed = false - ClearPedTasks(PlayerPedId()) - Wait(125) - DestroyAllProps() - OnEmotePlay(emote, CurrentAnimationName, CurrentTextureVariation) -end) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Keybinds.lua b/resources/[standalone]/rpemotes-reborn-1.8.5/client/Keybinds.lua deleted file mode 100644 index 08a57844c..000000000 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Keybinds.lua +++ /dev/null @@ -1,65 +0,0 @@ -if not Config.Keybinding then return end - - ------------------------------------------------------------------------------------------------------ --- Commands / Events -------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------ - -for i = 1, #Config.KeybindKeys do -local cmd = string.format('emoteSelect%s', i) -RegisterCommand(cmd, function() - local emote = GetResourceKvpString(string.format('%s_emob%s', Config.keybindKVP, i)) - if emote and emote ~= "" then - EmoteCommandStart(nil, { emote, 0 }) - end -end, false) -RegisterKeyMapping(cmd, string.format('Emote bind %s', i), 'keyboard', Config.KeybindKeys[i]) -end - ------------------------------------------------------------------------------------------------------ ------- Functions and stuff -------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------ - -function EmoteBindStart(source, args, raw) - if #args > 0 then - local numkey = tonumber(args[1]) - local emote = string.lower(args[2]) - if type(numkey) == "number" then - if RP.Emotes[emote] ~= nil - or RP.Dances[emote] ~= nil - or RP.PropEmotes[emote] ~= nil - or RP.AnimalEmotes[emote] ~= nil - then - SetResourceKvp(string.format('%s_emob%s', Config.keybindKVP, numkey), emote) - else - EmoteChatMessage("'" .. emote .. "' " .. Translate('notvalidemote') .. "") - end - else - EmoteChatMessage("'" .. numkey .. "' " .. Translate('notvalidkey')) - end - else - DebugPrint('Invalid number of arguments to \'EmoteBindStart\'') - end -end - -function ListKeybinds() - for i = 1, #Config.KeybindKeys do - local emote = GetResourceKvpString(string.format('%s_emob%s', Config.keybindKVP, i)) - if emote then - EmoteChatMessage(string.format('Emote %s : %s',i, emote)) - end - end -end - -function DeleteEmote(args) - if #args > 0 then - local numkey = tonumber(args[1]) - if type(numkey) == "number" then - DeleteResourceKvp(string.format('%s_emob%s', Config.keybindKVP, numkey)) - else - EmoteChatMessage("'" .. numkey .. "' " .. Translate('notvalidkey')) - end - else - DebugPrint("invalid") - end -end \ No newline at end of file diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/frameworks/esx.lua b/resources/[standalone]/rpemotes-reborn-1.8.5/client/frameworks/esx.lua deleted file mode 100644 index 7b60a681b..000000000 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/frameworks/esx.lua +++ /dev/null @@ -1,100 +0,0 @@ -if Config.Framework ~= 'esx' then return end - -local framework = 'es_extended' -local state = GetResourceState(framework) - -if state == 'missing' or state == "unknown" then - -- Framework can't be used if it's missing or unknown - return -end - -ESX, PlayerData, IsLoggedIn = nil, nil, false - --- ESX core parts -ESX = exports[framework]:getSharedObject() -PlayerData = ESX.GetPlayerData() -IsLoggedIn = false - -RegisterNetEvent('esx:onPlayerSpawn', function() - PlayerData = ESX.GetPlayerData() - IsLoggedIn = true -end) - --- This is here to get the player data when the resource is restarted instead of having to log out and back in each time --- This won't set the player data too early as this only triggers when the server side is started and not the client side -AddEventHandler('onResourceStart', function(resource) - if resource == GetCurrentResourceName() then - Wait(200) - PlayerData = ESX.GetPlayerData() - IsLoggedIn = true - end -end) - -function CanUseFavKeyBind() - return not ESX.PlayerData.dead -end - --- Added events -RegisterNetEvent('animations:client:PlayEmote', function(args) - if not ESX.PlayerData.dead then - EmoteCommandStart(source, args) - end -end) - -if Config.Keybinding then - RegisterNetEvent('animations:client:BindEmote', function(args) - if not ESX.PlayerData.dead then - EmoteBindStart(nil, args) - end - end) - - RegisterNetEvent('animations:client:EmoteBinds', function() - if not ESX.PlayerData.dead then - ListKeybinds() - end - end) - - RegisterNetEvent('animations:client:EmoteDelete', function(args) - if not ESX.PlayerData.dead then - DeleteEmote(args) - end - end) -end - - -RegisterNetEvent('animations:client:EmoteMenu', function() - if not ESX.PlayerData.dead then - OpenEmoteMenu() - end -end) - -RegisterNetEvent('animations:client:ListEmotes', function() - if not ESX.PlayerData.dead then - EmotesOnCommand() - end -end) - -RegisterNetEvent('animations:client:Walk', function(args) - if not ESX.PlayerData.dead then - WalkCommandStart(args) - end -end) - -RegisterNetEvent('animations:client:ListWalks', function() - if not ESX.PlayerData.dead then - WalksOnCommand() - end -end) - --- Added by https://github.dev/qbcore-framework/dpemotes/ - -CanDoEmote = true -RegisterNetEvent('animations:ToggleCanDoAnims', function(bool) - CanDoEmote = bool -end) - -RegisterNetEvent('animations:client:EmoteCommandStart', function(args) - if CanDoEmote then - EmoteCommandStart(source, args) - end -end) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/frameworks/qb-core.lua b/resources/[standalone]/rpemotes-reborn-1.8.5/client/frameworks/qb-core.lua deleted file mode 100644 index 47b45ea06..000000000 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/frameworks/qb-core.lua +++ /dev/null @@ -1,108 +0,0 @@ -if Config.Framework ~= 'qb-core' then return end - -local framework = 'qb-core' -local state = GetResourceState(framework) - -if state == 'missing' or state == "unknown" then - -- Framework can't be used if it's missing or unknown - return -end - -QBCore, PlayerData, isLoggedIn = nil, nil, false - --- QB core parts -QBCore = exports[framework]:GetCoreObject() -PlayerData = QBCore.Functions.GetPlayerData() -isLoggedIn = false - -RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() - PlayerData = QBCore.Functions.GetPlayerData() - isLoggedIn = true -end) - -RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() - PlayerData = {} - isLoggedIn = false -end) - -RegisterNetEvent('QBCore:Player:SetPlayerData', function(val) - PlayerData = val -end) - --- This is here to get the player data when the resource is restarted instead of having to log out and back in each time --- This won't set the player data too early as this only triggers when the server side is started and not the client side -AddEventHandler('onResourceStart', function(resource) - if resource == GetCurrentResourceName() then - Wait(200) - PlayerData = QBCore.Functions.GetPlayerData() - isLoggedIn = true - end -end) - -function CanUseFavKeyBind() - return not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] -end - --- Added events -RegisterNetEvent('animations:client:PlayEmote', function(args) - if not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] then - EmoteCommandStart(source, args) - end -end) - -if Config.Keybinding then - RegisterNetEvent('animations:client:BindEmote', function(args) - if not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] then - EmoteBindStart(nil, args) - end - end) - - RegisterNetEvent('animations:client:EmoteBinds', function() - if not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] then - ListKeybinds() - end - end) - - RegisterNetEvent('animations:client:EmoteDelete', function(args) - if not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] then - DeleteEmote(args) - end - end) -end - -RegisterNetEvent('animations:client:EmoteMenu', function() - if not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] then - OpenEmoteMenu() - end -end) - -RegisterNetEvent('animations:client:ListEmotes', function() - if not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] then - EmotesOnCommand() - end -end) - -RegisterNetEvent('animations:client:Walk', function(args) - if not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] then - WalkCommandStart(source, args) - end -end) - -RegisterNetEvent('animations:client:ListWalks', function() - if not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] then - WalksOnCommand() - end -end) - --- Added by https://github.dev/qbcore-framework/dpemotes/ - -CanDoEmote = true -RegisterNetEvent('animations:ToggleCanDoAnims', function(bool) - CanDoEmote = bool -end) - -RegisterNetEvent('animations:client:EmoteCommandStart', function(args) - if CanDoEmote then - EmoteCommandStart(source, args) - end -end) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/config.lua b/resources/[standalone]/rpemotes-reborn-1.8.5/config.lua deleted file mode 100644 index 12cd37aa3..000000000 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/config.lua +++ /dev/null @@ -1,145 +0,0 @@ -Config = { - -- Menu Options - MenuLanguage = 'de', -- Change the language of the menu here!. - DebugDisplay = false, -- Set this to true to enable some extra prints - EnableCancelKeybind = true, -- Set this to false if you have something else on X, and then just use /e c to cancel emotes. - CancelEmoteKey = 'x', -- Get the button string here https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/ - MenuKeybindEnabled = true, - MenuKeybind = 'f4', -- Get the button string here https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/ - FavKeybindEnabled = true, -- You can disable the Favorite emote keybinding here. - FavKeybind = 'capital', -- Get the button string here https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/ - Keybinding = false, -- enable this to turn on keybinding. - keybindKVP = "rpemotes", -- The keybind KVP name - NotificationsAsChatMessage = false, -- If you don't like native GTA 5 notifications, you can disable them here to have messages in the chat. - Framework = 'qb-core', -- Used for few framework-dependent things. Accepted values: 'qb-core', 'esx' or false - Search = true, -- Used to enable or disable the search feature in the menu. - CancelPreviousEmote = false, -- If turned on, playing an emote will cancel the previous one. - DisableControls = false, -- Disable specific controls when menu is open, can be configured in NativeUI.lua:2452 (approximately) - - -- Menu Customization Options - MenuTitle = '', -- You can change the name of the menu here or leave it blank to remove the text in front of the custom banners - TitleOutline = false, - TitleColour = {R = 255, G = 0, B = 255, A = 255}, --- The colour of the menu banner text in RGB. This is white by default aka 255, 255, 255. See https://www.rapidtables.com/web/color/RGB_Color.html for colours. - MenuPosition = 'right', -- You can change the menu position here. Use 'left' or 'right' - CustomMenuEnabled = true, -- You can change the header image for the menu here, Note this might cause an issue of the image getting stuck on people's screens - - -- Combat Car, and Player Movement Options - DisarmPlayer = false, -- Set this to true if you want to disarm the player when they play an emote. - AllowPunching = false, -- Set this to true if you want to allow people punching while emotes are playing - AllowedInCars = true, -- Set this if you really wanna disable emotes in cars, as of 1.7.2 they only play the upper body part if in a vehicle - -- You can disable the menu here / change the keybind. It is currently set to F4 - -- The keybind you set here will be server-sided for new players. existing players can set their own in the ESC menu keybind settings - AllowInWater = false, -- If turned off, opening the menu and playing an emote will not be possible while swimming - - -- Ragdoll options - RagdollEnabled = true, -- You can enable or disable the Ragdoll keybinding here. - RagdollKeybind = 'u', -- Get the button string here https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/ - -- You can enable or disable Ragdoll as Toggle here. Only works if RagdollEnabled is set to true. - RagdollAsToggle = true, - - -- Expressions, Walks, and More Menu Options - ExpressionsEnabled = true, -- You can disable the Facial Expressions menu here. - PersistentExpression = true, -- Saves expression style to client and applies them on joining - WalkingStylesEnabled = true, -- You can disable the Walking Styles menu here. - PersistentWalk = true, -- Saves walk styles to client and applies them on joining - SharedEmotesEnabled = true, -- You can disable the Shared Emotes here. - AdultEmotesDisabled = false, -- You can disable the Adult Emotes here. - AnimalEmotesEnabled = true, -- You can disable the Animal Emotes here. - - -- Hands Up Options - HandsupEnabled = false, -- You can disable the handsup here / change the keybind. It is currently set to Y - HandsupKeybind = 'Y', -- Get the button string here https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/ - HandsupKeybindEnabled = false, - HandsupKeybindInCarEnabled = false, - PersistentEmoteAfterHandsup = true, -- If true, you will play the emote you were playing previously after you stop handsup. - HoldToHandsUp = false, -- Hands-up action occurs only while holding the button down - - -- Pointing Options - PointingEnabled = true, -- You can disable the finger pointing here / change the keybind. It is currently set to B - PointingKeybindEnabled = true, - PointingKeybind = 'B', -- Get the button string here https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/ - PointingKeybindInCarEnabled = false, - PersistentEmoteAfterPointing = true, -- If true, you will play the emote you were playing previously after you stop pointing. - - -- Crouching Options - CrouchEnabled = false, -- If crouching should be enabled. - CrouchKeybindEnabled = true, -- If true, crouching will use keybinds. - CrouchKeybind = 'lcontrol', -- The default crouch keybind, get the button string here: https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/ - CrouchOverrideStealthMode = false, -- If true, you won't enter stealth mode even if the crouch key and the 'duck' key are the same. - FpsMode = false, -- set this to true if you have first-person shooting to disable the ability to crouch and shoot in third-person - - -- Crawling Options - CrawlEnabled = true, -- If crawling should be enabled. - CrawlKeybindEnabled = true, -- If true, crawling will use keybinds. - CrawlKeybind = 'rcontrol', -- The default crawl keybind, get the button string here: https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/ - - -- Binocular Options - BinocularsEnabled = false, -- If set to true, the /binoculars command will be enabled. - AllowVisionsToggling = false, -- If set to true, you'll be able to toggle between different vision modes in the binoculars - - -- News Camera Options - NewscamEnabled = false, -- If set to true, the /newscam command will be enabled. - - NoIdleCam = true, -- Controls wether the idle cam can be disabled by players or not - - -- Preview Ped Options - PreviewPed = true, -- Shows a preview of the emote on the player's ped next to the emote menu. Note that resmon will increase when this when emotes are being previewed. - - CheckForUpdates = true -} - -Config.KeybindKeys = { - 'NUMPAD1', - 'NUMPAD2', - 'NUMPAD3', - 'NUMPAD4', - 'NUMPAD5', - 'NUMPAD6', - 'NUMPAD7', - 'NUMPAD8', - 'NUMPAD9' -} - -Config.Credits = { - {title = "Thanks to the community", subtitle = "For supporting and using RP Emotes!"}, - {title = "Thanks Enzo2991 ๐Ÿ‡ง๐Ÿ‡ช ", subtitle = "Enzo2991 ๐Ÿ‡ง๐Ÿ‡ช for creating the ped preview functionality, keybind with kvp"}, - {title = "Thanks ~o~DullPear ๐Ÿ~s~", subtitle = "~o~DullPear~s~ for the original dpemotes โค๏ธ"}, - {title = "Thanks Kibook ๐Ÿฉ", subtitle = "Kibook for the addition of Animal Emotes ๐Ÿฉ submenu."}, - {title = "Thanks ~y~AvaN0x ๐Ÿ‡ซ๐Ÿ‡ท~s~", subtitle = "~y~AvaN0x~s~ ๐Ÿ‡ซ๐Ÿ‡ท for reformatting and assisting with code and additional features ๐Ÿ™"}, - {title = "Thanks Mads ๐Ÿค–", subtitle = "Mads ๐Ÿค– for the addition of Exit Emotes, Crouch & Crawl โš™๏ธ"}, - {title = "Thanks Mathu_lmn ๐Ÿ‡ซ๐Ÿ‡ท ", subtitle = "Mathu_lmn ๐Ÿ‡ซ๐Ÿ‡ท Additional features and fixes ๐Ÿ› ๏ธ"}, - {title = "Thanks northsqrd โš™๏ธ", subtitle = "northsqrd for assisting with search feature and phone colours ๐Ÿ”Ž"}, - {title = "Thanks GeekGarage ๐Ÿค“", subtitle = "GeekGarage for assisting with code and features"}, - {title = "Thanks SMGMissy ๐Ÿช–", subtitle = "SMGMissy for the custom pride flags ๐Ÿณ๏ธโ€๐ŸŒˆ."}, - {title = "Thanks Dollie ๐Ÿ‘ง", subtitle = "DollieMods for the custom emotes ๐Ÿ’œ."}, - {title = "Thanks Tigerle ๐Ÿฏ", subtitle = "Tigerle for assisting with attached Shared Emotes โš™๏ธ."}, - {title = "Thanks MissSnowie ๐Ÿฐ", subtitle = "MissSnowie for the custom emotes ๐Ÿ‡."}, - {title = "Thanks Smokey ๐Ÿ’จ", subtitle = "Smokey for the custom emotes ๐Ÿค™๐Ÿผ."}, - {title = "Thanks ~b~Ultrahacx ๐Ÿง‘โ€๐Ÿ’ป~s~", subtitle = "~b~Ultrahacx~s~ for the custom emotes โ˜บ๏ธ."}, - {title = "Thanks BzZzi ๐Ÿคญ", subtitle = "BzZzi for the custom props ๐Ÿฉ."}, - {title = "Thanks Natty3d ๐Ÿญ", subtitle = "Natty3d for the custom lollipop props ๐Ÿญ."}, - {title = "Thanks Amnilka ๐Ÿ‡ต๐Ÿ‡ฑ", subtitle = "Amnilka for the custom emotes โ˜บ๏ธ."}, - {title = "Thanks LittleSpoon ๐Ÿฅ„", subtitle = "LittleSpoon for the custom emotes ๐Ÿ’—."}, - {title = "Thanks Pupppy ๐Ÿถ", subtitle = "Pupppy for the custom emotes ๐Ÿฆด."}, - {title = "Thanks SapphireMods", subtitle = "SapphireMods for the custom emotes โœจ."}, - {title = "Thanks QueenSisters Animations ๐Ÿ‘ญ", subtitle = "QueenSistersAnimations for the custom emotes ๐Ÿง"}, - {title = "Thanks BoringNeptune ๐Ÿ‘ฝ", subtitle = "BoringNeptune for the custom emotes ๐Ÿ•บ"}, - {title = "Thanks Moses ๐Ÿฎ", subtitle = "-Moses- for the custom emotes ๐Ÿงก" }, - {title = "Thanks PataMods ๐Ÿ“", subtitle = "PataMods for the custom props ๐Ÿ•"}, - {title = "Thanks Crowded1337 ๐Ÿ‘œ", subtitle = "Crowded1337 for the custom Gucci bag ๐Ÿ‘œ"}, - {title = "Thanks EnchantedBrownie ๐Ÿช", subtitle = "EnchantedBrownie ๐Ÿช for the custom animations ๐Ÿช"}, - {title = "Thanks Copofiscool ๐Ÿ‡ฆ๐Ÿ‡บ", subtitle = "Copofiscool for the Favorite Emote keybind toggle fix ๐Ÿ‡ฆ๐Ÿ‡บ"}, - {title = "Thanks iSentrie ", subtitle = "iSentrie for assisting with code ๐Ÿ› ๏ธ"}, - {title = "Thanks Chocoholic Animations ๐Ÿซ", subtitle = "Chocoholic Animations for the custom emotes ๐Ÿซ"}, - {title = "Thanks CrunchyCat ๐Ÿฑ", subtitle = "CrunchyCat ๐Ÿฑ for the custom emotes ๐Ÿฑ"}, - {title = "Thanks KayKayMods", subtitle = "KayKayMods for the custom props ๐Ÿง‹"}, - {title = "Thanks Dark Animations", subtitle = "Dark Animations for the custom animations ๐Ÿ–ค"}, - {title = "Thanks Brum ๐Ÿ‡ฌ๐Ÿ‡ง", subtitle = "Brum for the custom props ๐Ÿ‡ฌ๐Ÿ‡ง"}, - {title = "Thanks Chico ๐Ÿ’€", subtitle = "Chico ๐Ÿ’€ for fixing persistent walkstyles and moods for QB-Core and ESX." }, - {title = "Thanks -EcLiPsE- โœŒ๐Ÿป", subtitle = "-EcLiPsE- โœŒ๐Ÿป for NPC prop sets and GTA Online biker animations"}, - {title = "Thanks MrWitt ๐Ÿฆ‘๏ธ", subtitle = "MrWitt ๐Ÿฆ‘ for the custom animations."}, - {title = "Thanks AdoredRose ๐ŸŒน", subtitle = "AdoredRose ๐ŸŒน for assistance with adding animations."}, - {title = "Thanks DRX Animations ๐Ÿ‘‘", subtitle = "DRX Animations ๐Ÿ‘‘ for the custom animations"}, - {title = "Thanks Radial ๐Ÿซก", subtitle = "Radial on discord for contributing animations code"}, - {title = "TayMcKenzieNZ ๐Ÿ‡ณ๐Ÿ‡ฟ", subtitle = "TayMcKenzieNZ ๐Ÿ‡ณ๐Ÿ‡ฟ Previous maintainer of RP Emotes."}, -} diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/header.png b/resources/[standalone]/rpemotes-reborn-1.8.5/header.png deleted file mode 100644 index 5e679229d..000000000 Binary files a/resources/[standalone]/rpemotes-reborn-1.8.5/header.png and /dev/null differ diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/server/Server.lua b/resources/[standalone]/rpemotes-reborn-1.8.5/server/Server.lua deleted file mode 100644 index 87db00e0c..000000000 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/server/Server.lua +++ /dev/null @@ -1,177 +0,0 @@ ------------------------------------------------------------------------------------------------------ --- Shared Emotes Syncing --------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------ - -RegisterNetEvent("ServerEmoteRequest", function(target, emotename, etype) - if not Player(source).state.canEmote then return end - - local ped = GetPlayerPed(source) - - if target == -1 then - return - end - local tped = GetPlayerPed(target) - local pedcoord = GetEntityCoords(ped) - local targetcoord = GetEntityCoords(tped) - - local distance = #(pedcoord - targetcoord) - - if distance > 3 then - return - end - - TriggerClientEvent("ClientEmoteRequestReceive", target, emotename, etype, source) -end) - -RegisterNetEvent("ServerValidEmote", function(target, requestedemote, otheremote) - local ped = GetPlayerPed(source) - - if target == -1 then - return - end - local tped = GetPlayerPed(target) - local pedcoord = GetEntityCoords(ped) - local targetcoord = GetEntityCoords(tped) - - local distance = #(pedcoord - targetcoord) - - if distance > 3 then - return - end - - TriggerClientEvent("SyncPlayEmote", source, otheremote, target) - TriggerClientEvent("SyncPlayEmoteSource", target, requestedemote, source) -end) - -RegisterNetEvent("ServerEmoteCancel", function(target) - TriggerClientEvent("SyncCancelEmote", target, source) -end) - ---#region ptfx -RegisterNetEvent("rpemotes:ptfx:sync", function(asset, name, offset, rot, bone, scale, color) - if type(asset) ~= "string" or type(name) ~= "string" or type(offset) ~= "vector3" or type(rot) ~= "vector3" then - print("[rpemotes] ptfx:sync: invalid arguments for source:", source) - return - end - - local srcPlayerState = Player(source).state - - srcPlayerState:set("ptfxAsset", asset, true) - srcPlayerState:set("ptfxName", name, true) - srcPlayerState:set("ptfxOffset", offset, true) - srcPlayerState:set("ptfxRot", rot, true) - srcPlayerState:set("ptfxBone", bone, true) - srcPlayerState:set("ptfxScale", scale, true) - srcPlayerState:set("ptfxColor", color, true) - srcPlayerState:set("ptfxPropNet", false, true) - srcPlayerState:set("ptfx", false, true) -end) - -RegisterNetEvent("rpemotes:ptfx:syncProp", function(propNet) - local srcPlayerState = Player(source).state - if propNet then - -- Prevent infinite loop to get entity - local waitForEntityToExistCount = 0 - while waitForEntityToExistCount <= 100 and not DoesEntityExist(NetworkGetEntityFromNetworkId(propNet)) do - Wait(10) - waitForEntityToExistCount = waitForEntityToExistCount + 1 - end - - -- If below 100 then we could find the loaded entity - if waitForEntityToExistCount < 100 then - srcPlayerState:set("ptfxPropNet", propNet, true) - return - end - end - -- If we reach this point then we couldn"t find the entity - srcPlayerState:set("ptfxPropNet", false, true) -end) ---#endregion ptfx - --- Emote props extractor -local function ExtractEmoteProps(format) - local format = tonumber(format) - local xt, c, total = "", "", 0 - if format == 1 then - print("Selected format: ^2\"prop_name\",") - xt = "\""; c = "," - elseif format == 2 then - print("Selected format: ^2\"prop_name\",") - xt = "\""; c = "," - elseif format == 3 then - print("Selected format: ^2prop_name,") - elseif format == 4 then - print("Selected to calculate ^2total amount of emotes^0.") - else - print( - "\n### RPEmotes - Props Extractor ###\n\n^3Select output format^0\nAvailable formats:\n^11^0 - ^2\"prop_name\",\n^12^0 - ^2\"prop_name\",\n^13^0 - ^2prop_name\n^14^0 - ^2calculate total emotes\n\n^0Command usage example: ^5emoteextract 1^0\n") - return - end - - local animationFile = LoadResourceFile(GetCurrentResourceName(), "client/AnimationList.lua") - if not animationFile then return nil end - - local f, err = load(animationFile .. " return RP") - if err then return nil end - - local success, res = pcall(f) - if not success then return nil end - - if format == 4 then - local emoteTypes = { "Shared", "Dances", "AnimalEmotes", "Emotes", "PropEmotes", "Expressions", "Walks" } - local countEmotesWith = 0 - local countEmotes = 0 - - for i = 1, #emoteTypes do - local emoteType = emoteTypes[i] - for _, _ in pairs(res[emoteType]) do - if emoteType == "Expressions" or emoteType == "Walks" then - countEmotesWith += 1 - else - countEmotes += 1 - end - end - end - - local totalEmotes = countEmotesWith + countEmotes - - print("Total Expressions and Walks: ^3" .. countEmotesWith .. "^0") - print("Total Emotes without Expressions and Walks: ^3" .. countEmotes .. "^0") - print("Total Emotes: ^3" .. totalEmotes .. "^0") - else - -- table to keep track of exported values - local exportedValues = {} - -- open file for writing - local file = assert(io.open(GetResourcePath(GetCurrentResourceName()) .. "/prop_list.lua", "w")) - - -- tables that has props: - -- RP.PropEmotes - -- RP.Shared (most likely all props mentioned in here is used in PropEmotes, so I don"t check it) - for _, value in pairs(res.PropEmotes) do - -- check if the current value is a table and has an AnimationOptions field - if type(value) == "table" and value.AnimationOptions then - -- extract the Prop and SecondProp values and check if they"re nil and not already exported - local propValue = value.AnimationOptions.Prop - local secondPropValue = value.AnimationOptions.SecondProp - if propValue and not exportedValues[propValue] then - file:write(xt .. propValue .. xt .. c .. "\n") - exportedValues[propValue] = true - total += 1 - end - if secondPropValue and not exportedValues[secondPropValue] then - file:write(xt .. secondPropValue .. c .. "\n") - exportedValues[secondPropValue] = true - total += 1 - end - end - end - - print("Exported props: " .. total) - file:close() - end -end - -RegisterCommand("emoteextract", function(source, args) - if source > 0 then return end - ExtractEmoteProps(args[1]) -end, true) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/server/frameworks/esx.lua b/resources/[standalone]/rpemotes-reborn-1.8.5/server/frameworks/esx.lua deleted file mode 100644 index da87c4f53..000000000 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/server/frameworks/esx.lua +++ /dev/null @@ -1,59 +0,0 @@ -if Config.Framework ~= 'esx' then return end - -local framework = 'esx' -local state = GetResourceState(framework) - -if state == 'missing' or state == "unknown" then - -- Framework can't be used if it's missing or unknown - return -end - -local ESX = exports['es_extended']:getSharedObject() - -ESX.RegisterCommand('e', 'Play an emote', {{ name="emotename", help="dance, camera, sit or any valid emote."}}, true, function(source, args) - TriggerClientEvent('animations:client:PlayEmote', source, args) -end) - -ESX.RegisterCommand('emote', 'Play an emote', {{ name="emotename", help="dance, camera, sit or any valid emote."}}, true, function(source, args) - TriggerClientEvent('animations:client:PlayEmote', source, args) -end) - -if Config.Keybinding then - ESX.RegisterCommand('emotebind', 'user', function(xPlayer, args) - local arg = {args.key, args.emotename} - xPlayer.triggerEvent('animations:client:BindEmote', arg) - end, false, {help = Translate('link_emote_keybind'), arguments= {{name = "key", help= "1, 2, 3, 4, 5, 6", type='number'}, {name="emotename", help="dance, camera, sit or any valid emote.", type='string'}}}) - - ESX.RegisterCommand('emotebinds', 'user', function(xPlayer) - xPlayer.triggerEvent('animations:client:EmoteBinds') - end, false, {help = Translate('show_emote_keybind')}) - - ESX.RegisterCommand('emotedelete', 'user', function(xPlayer, args) - local arg = {args.key} - xPlayer.triggerEvent('animations:client:EmoteDelete', arg) - end, false, {help = Translate('remove_emote_keybind'), arguments={{name = "key", help= "1, 2, 3, 4, 5, 6", type='number'}}}) -end - -ESX.RegisterCommand('emotemenu', 'Open rpemotes menu (F3) by default.', {}, false, function(source) - TriggerClientEvent('animations:client:EmoteMenu', source) -end) - -ESX.RegisterCommand('em', 'Open rpemotes menu (F3) by default.', {}, false, function(source) - TriggerClientEvent('animations:client:EmoteMenu', source) -end) - -ESX.RegisterCommand('emotes', 'List available emotes.', {}, false, function(source) - TriggerClientEvent('animations:client:ListEmotes', source) -end) - -ESX.RegisterCommand('walk', 'Set your walkingstyle.', {{ name="style", help="/walks for a list of valid styles"}}, true, function(source, args) - TriggerClientEvent('animations:client:Walk', source, args) -end) - -ESX.RegisterCommand('walks', 'List available walking styles.', {}, false, function(source) - TriggerClientEvent('animations:client:ListWalks', source) -end) - -ESX.RegisterCommand('nearby', 'Share emote with a nearby player.', {{ name="emotename", help="hug, handshake, bro or any valid shared emote."}}, true, function(source, args) - TriggerClientEvent('animations:client:Nearby', source, args) -end) \ No newline at end of file diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/server/frameworks/qb-core.lua b/resources/[standalone]/rpemotes-reborn-1.8.5/server/frameworks/qb-core.lua deleted file mode 100644 index 3c5f22025..000000000 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/server/frameworks/qb-core.lua +++ /dev/null @@ -1,58 +0,0 @@ -if Config.Framework ~= 'qb-core' then return end - -local framework = 'qb-core' -local state = GetResourceState(framework) - -if state == 'missing' or state == "unknown" then - -- Framework can't be used if it's missing or unknown - return -end - -local QBCore = exports['qb-core']:GetCoreObject() - --- https://github.com/qbcore-framework/dpemotes/blob/master/Server/Server.lua#L101-L141 -QBCore.Commands.Add('e', 'Play an emote', {{ name="emotename", help="dance, camera, sit or any valid emote."}}, true, function(source, args) - TriggerClientEvent('animations:client:PlayEmote', source, args) -end) - -QBCore.Commands.Add('emote', 'Play an emote', {{ name="emotename", help="dance, camera, sit or any valid emote."}}, true, function(source, args) - TriggerClientEvent('animations:client:PlayEmote', source, args) -end) - -if Config.Keybinding then - QBCore.Commands.Add('emotebind', 'Bind an emote', {{ name="key", help="num4, num5, num6, num7. num8, num9. Numpad 4-9!"}, { name="emotename", help="dance, camera, sit or any valid emote."}}, true, function(source, args) - TriggerClientEvent('animations:client:BindEmote', source, args) - end) - - QBCore.Commands.Add('emotebinds', 'Check your currently bound emotes.', {}, false, function(source) - TriggerClientEvent('animations:client:EmoteBinds', source) - end) - - QBCore.Commands.Add('emotedelete', Translate('remove_emote_keybind'), {}, false, function(source, args) - TriggerClientEvent('animations:client:EmoteDelete', source, args) - end) -end - -QBCore.Commands.Add('emotemenu', 'Open rpemotes menu (F3) by default.', {}, false, function(source) - TriggerClientEvent('animations:client:EmoteMenu', source) -end) - -QBCore.Commands.Add('em', 'Open rpemotes menu (F3) by default.', {}, false, function(source) - TriggerClientEvent('animations:client:EmoteMenu', source) -end) - -QBCore.Commands.Add('emotes', 'List available emotes.', {}, false, function(source) - TriggerClientEvent('animations:client:ListEmotes', source) -end) - -QBCore.Commands.Add('walk', 'Set your walkingstyle.', {{ name="style", help="/walks for a list of valid styles"}}, true, function(source, args) - TriggerClientEvent('animations:client:Walk', source, args) -end) - -QBCore.Commands.Add('walks', 'List available walking styles.', {}, false, function(source) - TriggerClientEvent('animations:client:ListWalks', source) -end) - -QBCore.Commands.Add('nearby', 'Share emote with a nearby player.', {{ name="emotename", help="hug, handshake, bro or any valid shared emote."}}, true, function(source, args) - TriggerClientEvent('animations:client:Nearby', source, args) -end) \ No newline at end of file diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@fog_rifle_relaxed.ycd b/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@fog_rifle_relaxed.ycd deleted file mode 100644 index facee772b..000000000 Binary files a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@fog_rifle_relaxed.ycd and /dev/null differ diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@highlow_high_lean.ycd b/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@highlow_high_lean.ycd deleted file mode 100644 index 815a53c35..000000000 Binary files a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@highlow_high_lean.ycd and /dev/null differ diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@highlow_low_lean.ycd b/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@highlow_low_lean.ycd deleted file mode 100644 index 52af7b4c9..000000000 Binary files a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@highlow_low_lean.ycd and /dev/null differ diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@stack_pointman.ycd b/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@stack_pointman.ycd deleted file mode 100644 index 1ce4cd3f4..000000000 Binary files a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@stack_pointman.ycd and /dev/null differ diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@stack_three_man.ycd b/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@stack_three_man.ycd deleted file mode 100644 index 781a3361d..000000000 Binary files a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@stack_three_man.ycd and /dev/null differ diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@stack_two_man.ycd b/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@stack_two_man.ycd deleted file mode 100644 index 5d382920b..000000000 Binary files a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/rifleemotes/anim@stack_two_man.ycd and /dev/null differ diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/.github/CONTRIBUTING.md b/resources/[standalone]/rpemotes-reborn/.github/CONTRIBUTING.md similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/.github/CONTRIBUTING.md rename to resources/[standalone]/rpemotes-reborn/.github/CONTRIBUTING.md diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/.github/FUNDING.yml b/resources/[standalone]/rpemotes-reborn/.github/FUNDING.yml similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/.github/FUNDING.yml rename to resources/[standalone]/rpemotes-reborn/.github/FUNDING.yml diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/.github/ISSUE_TEMPLATE/bug_report.md b/resources/[standalone]/rpemotes-reborn/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/.github/ISSUE_TEMPLATE/bug_report.md rename to resources/[standalone]/rpemotes-reborn/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/.github/ISSUE_TEMPLATE/feature_request.md b/resources/[standalone]/rpemotes-reborn/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/.github/ISSUE_TEMPLATE/feature_request.md rename to resources/[standalone]/rpemotes-reborn/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/NativeUI.lua b/resources/[standalone]/rpemotes-reborn/NativeUI.lua similarity index 99% rename from resources/[standalone]/rpemotes-reborn-1.8.5/NativeUI.lua rename to resources/[standalone]/rpemotes-reborn/NativeUI.lua index c17a95a63..09ecd18dd 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/NativeUI.lua +++ b/resources/[standalone]/rpemotes-reborn/NativeUI.lua @@ -477,14 +477,14 @@ function GetByteCount(str) local bytes = 0 for c in str:gmatch("[%z\1-\127\194-\244][\128-\191]*") do - local a, b, c, d = c:byte(1, -1) + local a, b, cc, d = c:byte(1, -1) if a ~= nil then bytes = bytes + 1 end if b ~= nil then bytes = bytes + 1 end - if c ~= nil then + if cc ~= nil then bytes = bytes + 1 end if d ~= nil then @@ -2376,7 +2376,7 @@ end --]] function UIMenu.New(Title, Subtitle, X, Y, TxtDictionary, TxtName) - local X, Y = tonumber(X) or 0, tonumber(Y) or 0 + X, Y = tonumber(X) or 0, tonumber(Y) or 0 if Title ~= nil then Title = tostring(Title) or "" else Title = "" end if Subtitle ~= nil then Subtitle = tostring(Subtitle) or "" else Subtitle = "" end if TxtDictionary ~= nil then TxtDictionary = tostring(TxtDictionary) or "commonmenu" else TxtDictionary = "commonmenu" end @@ -2444,7 +2444,7 @@ function UIMenu.New(Title, Subtitle, X, Y, TxtDictionary, TxtName) ResetCursorOnOpen = false, MouseControlsEnabled = false, MouseEdgeEnabled = false, - ControlDisablingEnabled = Config.DisableControls, + ControlDisablingEnabled = Config.DisableControlsInMenu, Audio = { Library = "HUD_FRONTEND_DEFAULT_SOUNDSET", UpDown = "NAV_UP_DOWN", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/README.md b/resources/[standalone]/rpemotes-reborn/README.md similarity index 82% rename from resources/[standalone]/rpemotes-reborn-1.8.5/README.md rename to resources/[standalone]/rpemotes-reborn/README.md index 1d9d0d44d..4976a420f 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/README.md +++ b/resources/[standalone]/rpemotes-reborn/README.md @@ -89,9 +89,7 @@ Example Banner: Find our documentation [here](https://rpemotes-reborn.gitbook.io/guide) -When using our emote menu with other scripts, using the `TriggerEvent('animations:client:EmoteCommandStart` won't do anything because the events do not exist. These have simply been replaced with the following exports: - -**Note for legacy use of rpemotes:** if you have resources dependent on or currently using exports from rpemotes, rename rpemotes-reborn's folder to rpemotes to maintain functionality. Or, rename all exports from exports["rpemotes"] to exports["rpemotes-reborn"] +The rpemotes-reborn resource has the following exports: ```lua exports["rpemotes-reborn"]:EmoteCommandStart(emoteName, textureVariation) @@ -99,15 +97,17 @@ exports["rpemotes-reborn"]:EmoteCancel(forceCancel) โ€“ forceCancel is optional exports["rpemotes-reborn"]:CanCancelEmote(state) exports["rpemotes-reborn"]:IsPlayerCrouched() exports["rpemotes-reborn"]:IsPlayerProne() +exports["rpemotes-reborn"]:StopPlayerProne(force) -- force is optional +exports["rpemotes-reborn"]:GetPlayerProneType() -- returns the type of prone the player is in, either "onfront" or "onback" exports["rpemotes-reborn"]:IsPlayerCrawling() exports["rpemotes-reborn"]:IsPlayerPointing() exports["rpemotes-reborn"]:IsPlayerInAnim() -- returns current animation name or nil exports["rpemotes-reborn"]:IsPlayerInHandsUp() -exports["rpemotes-reborn"]:toggleWalkstyle(bool, message) -- bool to allow the user to change their walkstyle in the menu or not / message to show the user (optional, default is :"You are unable to change your walking style right now.")" exports["rpemotes-reborn"]:toggleBinoculars() exports["rpemotes-reborn"]:toggleNewscam() exports["rpemotes-reborn"]:getWalkstyle() -- Gets walk style of player, used to detect certain walk. useful for applying effects while doing certain walks like tripping or other "funny" effects. exports["rpemotes-reborn"]:setWalkstyle(name, force) -- name = "move_m@alien" or any other, force = optional bool. Lets you set or force a walk style, useful for scripts like retrieving a style before drinking and restoring it after sobering up. +exports["rpemotes-reborn"]:toggleWalkstyle(bool, message) -- bool to allow the user to change their walkstyle in the menu or not / message to show the user (optional, default is :"You are unable to change your walking style right now.")" ``` Having issues with players using emotes when/where they're not supposed to? Use the following where you need. This would be somewhere like if you want to disable emotes in jail or when someone is handcuffed/escorted: @@ -133,7 +133,7 @@ Alternatively, the player base can set their menu keybind to open rpemotes-rebor `Esc > settings > keybinds > fivem` -- More keybinds are now using key mappings which means that they are now available in your FiveM settings to change (`FavKeybind` and `RagdollKeybind`) +- More keybinds are now using key mappings which means that they are now available in your FiveM settings to change (`RagdollKeybind`) # Keybinds ๐ŸŽ›๏ธ @@ -260,12 +260,6 @@ No Idle Cam allows players to disable the idle camera animation on foot and in v -# Favorite Emote - -Players can search for an emote (so long as search is enabled) and press LEFT SHIFT and CAPLOCKS on their keyboard to add it to their 'Favorites'. Pressing CAPLOCKS will toggle the emote. - -Alternatively, you can use the ๐ŸŒŸ Favorite menu to find an emote and press enter. - # Exit Emotes Exit Emotes are used to make cancelling an animation more smoother and dynamic, such as getting up off a chair or throwing a cigarette out instead of dropping it. @@ -466,59 +460,57 @@ All animation creators have **_specifically_** asked that their content remain f **A huge thank you the following people for their amazing contributions to the menu:** - the FiveM community for using RP and updating rpemotes-reborn! +### Developers: - [The Popcorn RP community](https://discord.gg/popcornroleplay) for putting up with all my emote menu testing and troubleshooting issues with me +- [Mathu_lmn](https://github.com/Mathu-lmn) for maintaining the menu and adding features - [enzo2991](https://github.com/enzo2991) for creating the ped preview functionality, keybind with kvp - [DerDevHD](https://forum.cfx.re/t/fixed-remove-prop-after-scenario-animation/5002332/8) for the insight on deleting scenario props. +- [iSentrie](https://forum.cfx.re/u/isentrie/) for additional code, support, and joining the RPEmotes project - [Kibook](https://github.com/kibook) for the addition of the Animal Emotes sub-menu - [AvaN0x](https://github.com/AvaN0x) for reformatting and assisting with code, additional features, and figuring out shared particle effects - [Mads](https://github.com/MadsLeander) for joining the team as Co-Developer -- [Mathu_lmn](https://github.com/Mathu-lmn) for joining the team as Co-Developer - [Tigerle](https://forum.cfx.re/u/tigerle_studios) for providing the additional code required to make Shared Emotes work to its full extent -- [SMGMissy](https://jenscreations.tebex.io/) for creating the pride flag props -- [MissSnowie](https://www.gta5-mods.com/users/MissySnowie) for the Explicit Usage Rights Agreement to add free custom animations either publicly available or on their discord and for the motivational and overall moral support - [GeekGarage](https://github.com/geekgarage) for their knowledge, time, and dedication, helping to bring new and exciting features to the menu -- [Smokey](https://www.gta5-mods.com/users/struggleville) for the Explicit Usage Rights Agreement to add free custom animations either publicly available on their discord -- [BzZzi](https://forum.cfx.re/u/bzzzi/summary) for the Explicit Usage Rights Agreement to add free donuts, croissants and fire torch props -- [Natty3d](https://forum.cfx.re/u/natty3d/summary) for the Explicit Usage Rights Agreement to add free lollipop props - [northsqrd](https://github.com/0sqrd) for adding the search function, Animal Emotes config, mobile phone prop texture variants, and general contributions -- Crusopaul and Eki for discussing KVP and initializing it to the menu for persistent walk styles -- [Amnilka](https://www.gta5-mods.com/users/frabi) for the Explicit Usage Rights Agreement to add free custom animations either publicly available or on their discord -- [LittleSpoon](https://discord.gg/safeword) for the Explicit Usage Rights Agreement to add free custom animations either publicly available or on their discord -- [LadyyShamrockk](https://www.gta5-mods.com/users/LadyyShamrockk) For allowing us to include their emotes in rpemotes-reborn -- [Pupppy](https://discord.gg/rsN35X4s4N) for the Explicit Usage Rights Agreement to add free custom animations either publicly available or on their discord -- [SapphireMods](https://discord.gg/Hf8F4nTyzt) for the Explicit Usage Rights Agreement to add free custom animations either publicly available or on their discord -- [QueenSisters Animations](https://discord.gg/qbPtGwQuep) for the Explicit Usage Rights Agreement to add free custom animations either publicly available or on their discord -- [Kri's Graphic House](https://discord.gg/JueRG3fCy6) for the custom banners -- !MWooM#0597 on Discord for the custom banners -- DurtyFree for his work on particle effects and cataloging GTA-related information [DurtyFree GTA V Dump](https://github.com/DurtyFree/gta-v-data-dumps/blob/master/particleEffectsCompact.json). -- [BoringNeptune](https://www.gta5-mods.com/users/BoringNeptune) for the custom dance emotes -- [CMG Mods](https://www.gta5-mods.com/users/-moses-) for the custom emotes -- [prue ้ขœ](discord.gg/lunyxmods) for being a great friend and providing us with exclusive custom animations -- [PataMods](https://forum.cfx.re/u/Pata_PataMods) for the custom props -- [Crowded1337](https://www.gta5-mods.com/users/crowded1337) for the custom Gucci bag. I have removed the Gucci logo to comply with Rockstar Games & TakeTwo Interactive -- [EnchantedBrownie](https://www.gta5-mods.com/users/EnchantedBrownie) for the custom animations -- [Copofiscool](https://forum.cfx.re/u/copofiscool/) for adding a toggle to the Favorite Keybinds -- [iSentrie](https://forum.cfx.re/u/isentrie/) for additional code, support, and joining the RPEmotes project -- Chocoholic Animations for the custom animations -- [CrunchyCat](https://www.gta5-mods.com/users/crunchycat) for the custom animations -- [KayKayMods](https://discord.gg/5bYQVWVaxG) for the custom props -- [MonkeyWhisper](https://github.com/MonkeyWhisper) and [Project Sloth](https://github.com/Project-Sloth) for the custom props -- [Brummieee](https://forum.cfx.re/u/brummieee_maps/summary) for the custom props -- [Dark Animations](https://www.gta5-mods.com/users/Darks%20Animations) for the custom animations. - [Chico](https://forum.cfx.re/u/chico) for implementing natives to reapply persistent moods and walk styles for ESX and QB-Core frameworks -- [-EcLiPsE-](https://www.gta5-mods.com/users/-EcLiPsE-) for allowing me to implement [Improved Prop Sets](https://www.gta5-mods.com/misc/improved-propsets-meta) and [GTA Online Biker Idle Anims](https://www.gta5-mods.com/misc/bike-idle-animations) -- [MrWitt](https://www.gta5-mods.com/users/MrWitt)for the custom animations -- [AdoredRose](https://forum.cfx.re/u/adoredrose/summary) for assisting with animations -- [Vedere](https://discord.gg/XMywAMQ8Ef) for the custom props -- [DRX Animations](https://www.gta5-mods.com/users/DRX%2DAnimations) for the custom animations -- [VNSIanims](https://discord.gg/cTNrjYSXXG) for the custom animations -- [PNWParksFan](https://www.gta5-mods.com/users/PNWParksFan) for the custom props -- [LSPDFR member Sam](https://www.lcpdfr.com/downloads/gta5mods/misc/23386-lspd-police-badge/) for their Custom LSPD police badge -- [GTA5Mods user Sladus_Slawonkus](https://www.gta5-mods.com/misc/lspd-police-badge-replace-sladus_slawonkus) for their reskinned LSPD badge - [Scully](https://github.com/Scullyy/) for their past work on rpemotes -- [EP](https://github.com/EpKouhia) for their ice fishing props and emotes, originally used in scully_emotemenu -- [TayMcKenzieNZ](https://github.com/TayMcKenzieNZ) for their past work maintaining RP Emotes -- [ESX](https://github.com/esx-framework) for the creation of the translation system -- [41anims](https://www.gta5-mods.com/users/41anims) for allowing us to use their custom emotes in rpemotes-reborn -- [corbs](https://www.gta5-mods.com/users/corbs) for allowing us to use their custom emotes and poses in rpemotes-reborn -- [jaysigx](https://www.gta5-mods.com/misc/improved-umbrella) for allowing us to use their improved umbrella prop +- Crusopaul and Eki for discussing KVP and initializing it to the menu for persistent walk styles + +### Emote & Props Creators: +- [SMGMissy](https://jenscreations.tebex.io/) for creating the pride flag props +- [MissSnowie](https://www.gta5-mods.com/users/MissySnowie) +- [Smokey](https://www.gta5-mods.com/users/struggleville) +- [BzZzi](https://forum.cfx.re/u/bzzzi/summary) +- [Natty3d](https://forum.cfx.re/u/natty3d/summary) +- [Amnilka](https://www.gta5-mods.com/users/frabi) +- [LittleSpoon](https://discord.gg/safeword) +- [LadyyShamrockk](https://www.gta5-mods.com/users/LadyyShamrockk) +- [Pupppy](https://discord.gg/rsN35X4s4N) +- [SapphireMods](https://discord.gg/Hf8F4nTyzt) +- [QueenSisters Animations](https://discord.gg/qbPtGwQuep) +- DurtyFree for his work on particle effects and cataloging GTA-related information [DurtyFree GTA V Dump](https://github.com/DurtyFree/gta-v-data-dumps/blob/master/particleEffectsCompact.json) +- [BoringNeptune](https://www.gta5-mods.com/users/BoringNeptune) +- [CMG Mods](https://www.gta5-mods.com/users/-moses-) +- [prue ้ขœ](discord.gg/lunyxmods) +- [PataMods](https://forum.cfx.re/u/Pata_PataMods) +- [Crowded1337](https://www.gta5-mods.com/users/crowded1337) +- [EnchantedBrownie](https://www.gta5-mods.com/users/EnchantedBrownie) +- Chocoholic Animations +- [CrunchyCat](https://www.gta5-mods.com/users/crunchycat) +- [KayKayMods](https://discord.gg/5bYQVWVaxG) +- [MonkeyWhisper](https://github.com/MonkeyWhisper) and [Project Sloth](https://github.com/Project-Sloth) +- [Brummieee](https://forum.cfx.re/u/brummieee_maps/summary) +- [Dark Animations](https://www.gta5-mods.com/users/Darks%20Animations). +- [-EcLiPsE-](https://www.gta5-mods.com/users/-EcLiPsE-) for allowing me to implement [Improved Prop Sets](https://www.gta5-mods.com/misc/improved-propsets-meta) and [GTA Online Biker Idle Anims](https://www.gta5-mods.com/misc/bike-idle-animations) +- [MrWitt](https://www.gta5-mods.com/users/MrWitt) +- [Vedere](https://discord.gg/XMywAMQ8Ef) +- [DRX Animations](https://www.gta5-mods.com/users/DRX%2DAnimations) +- [VNSIanims](https://discord.gg/cTNrjYSXXG) +- [PNWParksFan](https://www.gta5-mods.com/users/PNWParksFan) +- [LSPDFR member Sam](https://www.lcpdfr.com/downloads/gta5mods/misc/23386-lspd-police-badge/) +- [GTA5Mods user Sladus_Slawonkus](https://www.gta5-mods.com/misc/lspd-police-badge-replace-sladus_slawonkus) +- [EP](https://github.com/EpKouhia) +- [TayMcKenzieNZ](https://github.com/TayMcKenzieNZ) +- [41anims](https://www.gta5-mods.com/users/41anims) +- [corbs](https://www.gta5-mods.com/users/corbs) +- [jaysigx](https://www.gta5-mods.com/misc/improved-umbrella) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/animals.lua b/resources/[standalone]/rpemotes-reborn/animals.lua similarity index 92% rename from resources/[standalone]/rpemotes-reborn-1.8.5/animals.lua rename to resources/[standalone]/rpemotes-reborn/animals.lua index 7353f6675..0400c2e52 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/animals.lua +++ b/resources/[standalone]/rpemotes-reborn/animals.lua @@ -4,7 +4,7 @@ BigDogs = { "a_c_retriever", "a_c_shepherd", "a_c_rottweiler", - "ft-groe" + "ft-groe" } SmallDogs = { diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/AnimationList.lua b/resources/[standalone]/rpemotes-reborn/client/AnimationList.lua similarity index 99% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/AnimationList.lua rename to resources/[standalone]/rpemotes-reborn/client/AnimationList.lua index 8f8b90271..d8b3ac26e 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/AnimationList.lua +++ b/resources/[standalone]/rpemotes-reborn/client/AnimationList.lua @@ -246,26 +246,26 @@ RP.Walks = { ["Dreyfuss"] = { "move_dreyfuss" }, - ["Drunk"] = { + ["DrunkWalk"] = { "move_m@drunk@a" }, - ["Drunk2"] = { + ["DrunkWalk2"] = { "move_m@buzzed", "Drunk 2 - Buzzed" }, - ["Drunk3"] = { + ["DrunkWalk3"] = { "move_m@drunk@moderatedrunk", "Drunk 3 - Moderate" }, - ["Drunk4"] = { + ["DrunkWalk4"] = { "move_m@drunk@moderatedrunk_head_up", "Drunk 4 - Moderate 2" }, - ["Drunk5"] = { + ["DrunkWalk5"] = { "move_m@drunk@slightlydrunk", "Drunk 5 - Slightly Drunk" }, - ["Drunk6"] = { + ["DrunkWalk6"] = { "move_m@drunk@verydrunk", "Drunk 6 - Very Drunk" }, @@ -442,11 +442,11 @@ RP.Walks = { "move_f@hurry@b", "Hurry Female 2" }, - ["Injured"] = { + ["InjuredWalk"] = { "move_m@injured", "Injured" }, - ["Injured2"] = { + ["InjuredWalk2"] = { "move_f@injured", "Injured 2 - Female" }, @@ -6664,7 +6664,7 @@ RP.Emotes = { EmoteMoving = true } }, - ["handshake"] = { + ["solo_handshake"] = { "mp_ped_interaction", "handshake_guy_a", "Handshake", @@ -6673,7 +6673,7 @@ RP.Emotes = { EmoteDuration = 3000 } }, - ["handshake2"] = { + ["solo_handshake2"] = { "mp_ped_interaction", "handshake_guy_b", "Handshake 2", @@ -8026,7 +8026,7 @@ RP.Emotes = { EmoteMoving = true } }, - ["stickup"] = { + ["solo_stickup"] = { "random@countryside_gang_fight", "biker_02_stickup_loop", "Stick Up", @@ -8665,7 +8665,7 @@ RP.Emotes = { EmoteMoving = true, } }, - ["slap"] = { + ["solo_slap"] = { "melee@unarmed@streamed_variations", "plyr_takedown_front_slap", "Slap", @@ -8675,7 +8675,7 @@ RP.Emotes = { EmoteDuration = 2000 } }, - ["headbutt"] = { + ["solo_headbutt"] = { "melee@unarmed@streamed_variations", "plyr_takedown_front_headbutt", "Headbutt" @@ -10807,15 +10807,6 @@ RP.Emotes = { EmoteLoop = true, EmoteMoving = false, } - }, - ["femaleposeq"] = { -- Custom Emote By DRX Animations - "drx@femalestand13", - "xrd", - "Female Pose Q", - AnimationOptions = { - EmoteLoop = true, - EmoteMoving = false - } }, ["femaleposer"] = { -- Custom Emote By DRX Animations "drx@femalestand14", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/AnimationListCustom.lua b/resources/[standalone]/rpemotes-reborn/client/AnimationListCustom.lua similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/AnimationListCustom.lua rename to resources/[standalone]/rpemotes-reborn/client/AnimationListCustom.lua diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Binoculars.lua b/resources/[standalone]/rpemotes-reborn/client/Binoculars.lua similarity index 99% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/Binoculars.lua rename to resources/[standalone]/rpemotes-reborn/client/Binoculars.lua index 8b19511d1..081366527 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Binoculars.lua +++ b/resources/[standalone]/rpemotes-reborn/client/Binoculars.lua @@ -162,7 +162,7 @@ if Config.BinocularsEnabled then end end) - exports('toggleBinoculars', function() + CreateExport('toggleBinoculars', function() UseBinocular() end) end diff --git a/resources/[standalone]/rpemotes-reborn/client/Bridge.lua b/resources/[standalone]/rpemotes-reborn/client/Bridge.lua new file mode 100644 index 000000000..cd7c271f2 --- /dev/null +++ b/resources/[standalone]/rpemotes-reborn/client/Bridge.lua @@ -0,0 +1,107 @@ +Framework = 'standalone' +PlayerLoaded, PlayerData = nil, {} + +local function InitializeFramework() + if GetResourceState('es_extended') == 'started' then + ESX = exports['es_extended']:getSharedObject() + Framework = 'esx' + + RegisterNetEvent('esx:playerLoaded', function(xPlayer) + PlayerData = xPlayer + PlayerLoaded = true + end) + + RegisterNetEvent('esx:onPlayerLogout', function() + PlayerData = {} + PlayerLoaded = false + end) + + AddEventHandler('esx:setPlayerData', function(key, value) + PlayerData[key] = value + end) + + AddEventHandler('onResourceStart', function(resourceName) + if GetCurrentResourceName() ~= resourceName then return end + PlayerData = ESX.GetPlayerData() + PlayerLoaded = true + end) + elseif GetResourceState('qb-core') == 'started' then + QBCore = exports['qb-core']:GetCoreObject() + Framework = 'qb' + + AddEventHandler('QBCore:Client:OnPlayerLoaded', function() + PlayerData = QBCore.Functions.GetPlayerData() + end) + + RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() + PlayerData = {} + end) + + AddEventHandler('onResourceStart', function(resourceName) + if GetCurrentResourceName() ~= resourceName then return end + PlayerData = QBCore.Functions.GetPlayerData() + end) + end + + print('[RPEmotes-Reborn] Framework initialized: ' .. Framework) +end + +function CanDoAction() + if Framework == 'esx' then + return PlayerLoaded and not PlayerData.dead + elseif Framework == 'qb' then + return LocalPlayer.state.isLoggedIn and not (PlayerData.metadata.inlaststand or PlayerData.metadata.isdead) + end + -- here you can implement your own standalone framework check + return true +end + +InitializeFramework() + + +-- EVENTS + +RegisterNetEvent('animations:client:PlayEmote', function(args) + if CanDoAction() then + EmoteCommandStart(args) + end +end) + +if Config.Keybinding then + RegisterNetEvent('animations:client:BindEmote', function(args) + if CanDoAction() then + EmoteBindStart(nil, args) + end + end) + + RegisterNetEvent('animations:client:EmoteBinds', function() + if CanDoAction() then + ListKeybinds() + end + end) + + RegisterNetEvent('animations:client:EmoteDelete', function(args) + if CanDoAction() then + DeleteEmote(args) + end + end) +end + + +RegisterNetEvent('animations:client:EmoteMenu', function() + if CanDoAction() then + OpenEmoteMenu() + end +end) + +RegisterNetEvent('animations:client:Walk', function(args) + if CanDoAction() then + WalkCommandStart(args) + end +end) + +RegisterNetEvent('animations:client:ListWalks', function() + if CanDoAction() then + WalksOnCommand() + end +end) \ No newline at end of file diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Crouch.lua b/resources/[standalone]/rpemotes-reborn/client/Crouch.lua similarity index 95% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/Crouch.lua rename to resources/[standalone]/rpemotes-reborn/client/Crouch.lua index b099f40f1..f1f08dc0f 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Crouch.lua +++ b/resources/[standalone]/rpemotes-reborn/client/Crouch.lua @@ -17,10 +17,17 @@ local function ResetCrouch() SetPedCanPlayAmbientAnims(playerPed, true) local walkstyle = GetResourceKvpString("walkstyle") - if walkstyle ~= nil then - RequestWalking(walkstyle) - SetPedMovementClipset(PlayerPedId(), walkstyle, 0.5) - RemoveClipSet(walkstyle) + if walkstyle then + local toApply = RP[walkstyle] + if not toApply or type(toApply) ~= "table" or toApply.category ~= "Walks" then + ResetPedMovementClipset(playerPed, 0.5) + DeleteResourceKvp("walkstyle") + DebugPrint('Invalid walkstyle found in KVP, resetting to default.') + return + end + RequestWalking(toApply[1]) + SetPedMovementClipset(PlayerPedId(), toApply[1], 0.5) + RemoveClipSet(toApply[1]) else ResetPedMovementClipset(playerPed, 0.5) end @@ -462,36 +469,33 @@ if Config.CrawlEnabled then TriggerEvent('chat:addSuggestion', '/crawl', Translate('crawl')) end - --- Exports -- - ---Returns if the player is crouched ---@return boolean local function IsPlayerCrouched() return isCrouched end -exports('IsPlayerCrouched', IsPlayerCrouched) +CreateExport('IsPlayerCrouched', IsPlayerCrouched) ---Returns if the player is prone (both when laying still and when moving) ---@return boolean local function IsPlayerProne() return IsProne end -exports('IsPlayerProne', IsPlayerProne) +CreateExport('IsPlayerProne', IsPlayerProne) ---Returns if the player is crawling (only when moving forward/backward) ---@return boolean local function IsPlayerCrawling() return isCrawling end -exports('IsPlayerCrawling', IsPlayerCrawling) +CreateExport('IsPlayerCrawling', IsPlayerCrawling) ---Returns either "onfront" or "onback", this can be used to check if the player is on his back or on his stomach. NOTE: This will still return a string even if the player is not prone. Use IsPlayerProne() to check if the player is prone. ---@return string local function GetPlayerProneType() return proneType end -exports('GetPlayerProneType', GetPlayerProneType) +CreateExport('GetPlayerProneType', GetPlayerProneType) -- Useful to call if the player gets handcuffed etc. -exports('StopPlayerProne', stopPlayerProne) +CreateExport('StopPlayerProne', stopPlayerProne) diff --git a/resources/[standalone]/rpemotes-reborn/client/Emote.lua b/resources/[standalone]/rpemotes-reborn/client/Emote.lua new file mode 100644 index 000000000..b496bfe37 --- /dev/null +++ b/resources/[standalone]/rpemotes-reborn/client/Emote.lua @@ -0,0 +1,895 @@ +-- You probably shouldn't touch these. +IsInAnimation = false +CurrentAnimationName = nil +CurrentTextureVariation = nil +InHandsup = false +CONVERTED = false + +local ChosenDict = "" +local CurrentAnimOptions = false +local PlayerGender = "male" +local PlayerProps = {} +local PreviewPedProps = {} +local PtfxNotif = false +local PtfxPrompt = false +local AnimationThreadStatus = false +local CheckStatus = false +local CanCancel = true +local InExitEmote = false +local ExitAndPlay = false +local EmoteCancelPlaying = false +local currentEmote = {} +local attachedProp +local scenarioObjects = { + `p_amb_coffeecup_01`, + `p_amb_joint_01`, + `p_cs_ciggy_01`, + `p_cs_ciggy_01b_s`, + `p_cs_clipboard`, + `prop_curl_bar_01`, + `p_cs_joint_01`, + `p_cs_joint_02`, + `prop_acc_guitar_01`, + `prop_amb_ciggy_01`, + `prop_amb_phone`, + `prop_beggers_sign_01`, + `prop_beggers_sign_02`, + `prop_beggers_sign_03`, + `prop_beggers_sign_04`, + `prop_bongos_01`, + `prop_cigar_01`, + `prop_cigar_02`, + `prop_cigar_03`, + `prop_cs_beer_bot_40oz_02`, + `prop_cs_paper_cup`, + `prop_cs_trowel`, + `prop_fib_clipboard`, + `prop_fish_slice_01`, + `prop_fishing_rod_01`, + `prop_fishing_rod_02`, + `prop_notepad_02`, + `prop_parking_wand_01`, + `prop_rag_01`, + `prop_scn_police_torch`, + `prop_sh_cigar_01`, + `prop_sh_joint_01`, + `prop_tool_broom`, + `prop_tool_hammer`, + `prop_tool_jackham`, + `prop_tennis_rack_01`, + `prop_weld_torch`, + `w_me_gclub`, + `p_amb_clipboard_01` +} + +if not Config.AnimalEmotesEnabled then + RP.AnimalEmotes = {} +end + +CreateThread(function() + LocalPlayer.state:set('canEmote', true, true) +end) + +local function RunAnimationThread() + local pPed = PlayerPedId() + if AnimationThreadStatus then return end + AnimationThreadStatus = true + CreateThread(function() + local sleep + while AnimationThreadStatus and (IsInAnimation or PtfxPrompt) do + sleep = 500 + + if IsInAnimation then + sleep = 0 + if IsPlayerAiming(pPed) then + EmoteCancel() + end + if not Config.AllowPunchingDuringEmote then + DisableControlAction(2, 140, true) + DisableControlAction(2, 141, true) + DisableControlAction(2, 142, true) + end + end + + if PtfxPrompt and CurrentAnimOptions then + sleep = 0 + if not PtfxNotif then + SimpleNotify(CurrentAnimOptions.PtfxInfo or Translate('ptfxinfo')) + PtfxNotif = true + end + if IsControlPressed(0, 47) then + PtfxStart() + Wait(CurrentAnimOptions.PtfxWait) + if CurrentAnimOptions.PtfxCanHold then + while IsControlPressed(0, 47) and IsInAnimation and AnimationThreadStatus do + Wait(5) + end + end + PtfxStop() + end + end + + Wait(sleep) + end + end) +end + +local function CheckStatusThread(dict, anim) + CreateThread(function() + if CheckStatus then + CheckStatus = false + Wait(10) + end + CheckStatus = true + while not IsEntityPlayingAnim(PlayerPedId(), dict, anim, 3) do + Wait(5) + end + while CheckStatus and IsInAnimation do + if not IsEntityPlayingAnim(PlayerPedId(), dict, anim, 3) then + DebugPrint("Animation ended") + DestroyAllProps() + EmoteCancel() + break + end + Wait(0) + end + end) +end + +local function cleanScenarioObjects(isClone) + local ped = isClone and ClonedPed or PlayerPedId() + local playerCoords = GetEntityCoords(ped) + + for i = 1, #scenarioObjects do + local deleteScenarioObject = GetClosestObjectOfType(playerCoords.x, playerCoords.y, playerCoords.z, 1.0, + scenarioObjects[i], false, true, true) + if DoesEntityExist(deleteScenarioObject) then + SetEntityAsMissionEntity(deleteScenarioObject, false, false) + DeleteObject(deleteScenarioObject) + end + end +end + +function EmoteCancel(force) + LocalPlayer.state:set('currentEmote', nil, true) + EmoteCancelPlaying = true + + if InExitEmote then + return + end + + if not CanCancel and not force then return end + + if ChosenDict == "MaleScenario" and IsInAnimation then + ClearPedTasksImmediately(PlayerPedId()) + IsInAnimation = false + DebugPrint("Forced scenario exit") + elseif ChosenDict == "Scenario" and IsInAnimation then + ClearPedTasksImmediately(PlayerPedId()) + IsInAnimation = false + DebugPrint("Forced scenario exit") + end + + PtfxNotif = false + PtfxPrompt = false + Pointing = false + + if IsInAnimation then + local ped = PlayerPedId() + if LocalPlayer.state.ptfx then + PtfxStop() + end + DetachEntity(ped, true, false) + CancelSharedEmote() + + if CurrentAnimOptions and CurrentAnimOptions.ExitEmote then + local options = CurrentAnimOptions + local ExitEmoteType = options.ExitEmoteType or "Emotes" + + if not RP[options.ExitEmote] then + DebugPrint("Exit emote was invalid") + IsInAnimation = false + ClearPedTasks(ped) + return + end + + OnEmotePlay(options.ExitEmote) + DebugPrint("Playing exit animation") + + local animationOptions = RP[options.ExitEmote].AnimationOptions + if animationOptions and animationOptions.EmoteDuration then + InExitEmote = true + SetTimeout(animationOptions.EmoteDuration, function() + InExitEmote = false + DestroyAllProps() + ClearPedTasks(ped) + EmoteCancelPlaying = false + end) + return + end + else + IsInAnimation = false + ClearPedTasks(ped) + EmoteCancelPlaying = false + end + DestroyAllProps() + end + cleanScenarioObjects(false) + AnimationThreadStatus = false + CheckStatus = false +end + +function EmoteMenuStart(name, category, textureVariation) + local emote = RP[name] + + if not emote then + return + end + + if emote.category ~= category then + DebugPrint("Emote category mismatch : " .. emote.category .. " vs " .. category) + return + end + + if category == "Expressions" then + SetPlayerPedExpression(name, true) + return + end + + if emote.category == "AnimalEmotes" then + CheckAnimalAndOnEmotePlay(name) + return + end + + OnEmotePlay(name, textureVariation) +end + +function EmoteMenuStartClone(name, category) + if not Config.PreviewPed then return end + if not DoesEntityExist(ClonedPed) then return end + + local emote = RP[name] + + if not emote then + return + end + + if emote.category ~= category then + DebugPrint("Emote category mismatch : " .. emote.category .. " vs " .. category) + return + end + + if category == "Expressions" then + SetFacialIdleAnimOverride(ClonedPed, emote[1], true) + return + end + + OnEmotePlayClone(name) +end + +function EmoteCommandStart(args) + if #args > 0 then + if IsEntityDead(PlayerPedId()) or IsPedRagdoll(PlayerPedId()) or IsPedGettingUp(PlayerPedId()) or IsPedInMeleeCombat(PlayerPedId()) then + TriggerEvent('chat:addMessage', { + color = { 255, 0, 0 }, + multiline = true, + args = { "RPEmotes", Translate('dead') } + }) + return + end + if (IsPedSwimming(PlayerPedId()) or IsPedSwimmingUnderWater(PlayerPedId())) and not Config.AllowInWater then + TriggerEvent('chat:addMessage', { + color = { 255, 0, 0 }, + multiline = true, + args = { "RPEmotes", Translate('swimming') } + }) + return + end + local name = string.lower(args[1]) + if name == "c" then + if IsInAnimation then + EmoteCancel() + else + EmoteChatMessage(Translate('nocancel')) + end + return + end + + local emote = RP[name] + if emote then + if emote.category == "AnimalEmotes" then + if Config.AnimalEmotesEnabled then + CheckAnimalAndOnEmotePlay(name) + else + EmoteChatMessage(Translate('animaldisabled')) + end + return + end + + if emote.category == "PropEmotes" and emote.AnimationOptions.PropTextureVariations then + if #args > 1 then + local textureVariation = tonumber(args[2]) + if emote.AnimationOptions.PropTextureVariations[textureVariation] then + OnEmotePlay(name, textureVariation - 1) + return + else + local str = "" + for k, v in ipairs(emote.AnimationOptions.PropTextureVariations) do + str = str .. string.format("\n(%s) - %s", k, v.Name) + end + + EmoteChatMessage(string.format(Translate('invalidvariation'), str), true) + OnEmotePlay(name, 0) + return + end + end + end + + OnEmotePlay(name) + else + EmoteChatMessage("'" .. name .. "' " .. Translate('notvalidemote') .. "") + end + end +end + +function CheckAnimalAndOnEmotePlay(name) + local playerPed = PlayerPedId() + local isValidPet = false + + if string.sub(name, 1, 4) == "bdog" then + for _, model in ipairs(BigDogs) do + if IsPedModel(playerPed, GetHashKey(model)) then + isValidPet = true + break + end + end + elseif string.sub(name, 1, 4) == "sdog" then + for _, model in ipairs(SmallDogs) do + if IsPedModel(playerPed, GetHashKey(model)) then + isValidPet = true + break + end + end + end + + if isValidPet then + OnEmotePlay(name) + else + EmoteChatMessage(Translate('notvalidpet')) + end +end + +---@param isClone? boolean +function DestroyAllProps(isClone) + if isClone then + for _, v in pairs(PreviewPedProps) do + DeleteEntity(v) + end + PreviewPedProps = {} + else + for _, v in pairs(PlayerProps) do + DeleteEntity(v) + end + PlayerProps = {} + end + DebugPrint("Destroyed Props for " .. (isClone and "clone" or "player")) +end + +---@param data table +---@return boolean +function AddProp(data) + assert(data.prop1, 'no prop1 passed') + assert(data.bone, 'no bone passed') + data.off1 = data.off1 or 0.0 + data.off2 = data.off2 or 0.0 + data.off3 = data.off3 or 0.0 + data.rot1 = data.rot1 or 0.0 + data.rot2 = data.rot2 or 0.0 + data.rot3 = data.rot3 or 0.0 + assert(data.noCollision == nil or type(data.noCollision) == "boolean", 'noCollision must be a boolean') + + local target = data.isClone and ClonedPed or PlayerPedId() + local x, y, z = table.unpack(GetEntityCoords(target)) + + if not IsModelValid(data.prop1) then + DebugPrint(tostring(data.prop1) .. " is not a valid model!") + return false + end + + LoadPropDict(data.prop1) + + attachedProp = CreateObject(GetHashKey(data.prop1), x, y, z + 0.2, not data.isClone, true, true) + + if data.textureVariation ~= nil then + SetObjectTextureVariation(attachedProp, data.textureVariation) + end + + if data.noCollision then + SetEntityCollision(attachedProp, false, false) + end + + AttachEntityToEntity(attachedProp, target, GetPedBoneIndex(target, data.bone), data.off1, data.off2, data.off3, data.rot1, data.rot2, data.rot3, + true, true, false, true, 1, true) + + if data.isClone then + table.insert(PreviewPedProps, attachedProp) + else + table.insert(PlayerProps, attachedProp) + end + + SetModelAsNoLongerNeeded(data.prop1) + DebugPrint("Added prop to " .. (data.isClone and "clone" or "player")) + return true +end + +function CheckGender() + PlayerGender = "male" + + if GetEntityModel(PlayerPedId()) == GetHashKey("mp_f_freemode_01") then + PlayerGender = "female" + end + + DebugPrint("Set gender to " .. PlayerGender) +end + +RegisterNetEvent('animations:ToggleCanDoAnims', function(value) + LocalPlayer.state:set('canEmote', value, true) +end) + +function OnEmotePlay(name, textureVariation) + local emoteData = RP[name] + if not emoteData then + EmoteChatMessage("'" .. name .. "' " .. Translate('notvalidemote') .. "") + return + end + + if not LocalPlayer.state.canEmote then return end + + if not DoesEntityExist(PlayerPedId()) then + return false + end + + cleanScenarioObjects(false) + + InVehicle = IsPedInAnyVehicle(PlayerPedId(), true) + Pointing = false + + if not Config.AllowEmoteInVehicle and InVehicle then + return + end + + if Config.AdultEmotesDisabled and emoteData.AdultAnimation then + return EmoteChatMessage(Translate('adultemotedisabled')) + end + + if InExitEmote then + return false + end + + if Config.CancelPreviousEmote and IsInAnimation and not ExitAndPlay and not EmoteCancelPlaying then + ExitAndPlay = true + DebugPrint("Canceling previous emote and playing next emote") + PlayExitAndEnterEmote(name, textureVariation) + return + end + + + local animOption = emoteData.AnimationOptions + if InVehicle then + if animOption and animOption.NotInVehicle then + return EmoteChatMessage(Translate('not_in_a_vehicle')) + end + elseif animOption and animOption.onlyInVehicle then + return EmoteChatMessage(Translate('in_a_vehicle')) + end + + if CurrentAnimOptions and CurrentAnimOptions.ExitEmote and animOption and animOption.ExitEmote then + if not (animOption and CurrentAnimOptions.ExitEmote == animOption.ExitEmote) and RP[CurrentAnimOptions.ExitEmote][2] ~= emoteData[2] then + return + end + end + + if IsInActionWithErrorMessage() then + return false + end + + ChosenDict = emoteData[1] + local anim = emoteData[2] + CurrentAnimationName = name + LocalPlayer.state:set('currentEmote', name, true) + CurrentTextureVariation = textureVariation + CurrentAnimOptions = animOption + + if Config.DisarmPlayerOnEmote then + if IsPedArmed(PlayerPedId(), 7) then + SetCurrentPedWeapon(PlayerPedId(), GetHashKey('WEAPON_UNARMED'), true) + end + end + + if animOption and animOption.Prop then + DestroyAllProps() + end + + if ChosenDict == "MaleScenario" or ChosenDict == "Scenario" or ChosenDict == "ScenarioObject" then + if InVehicle then return end + CheckGender() + ClearPedTasks(PlayerPedId()) + DestroyAllProps() + if ChosenDict == "MaleScenario" then + if PlayerGender == "male" then + TaskStartScenarioInPlace(PlayerPedId(), anim, 0, true) + DebugPrint("Playing scenario = (" .. anim .. ")") + else + EmoteCancel() + EmoteChatMessage(Translate('maleonly')) + return + end + elseif ChosenDict == "ScenarioObject" then + local BehindPlayer = GetOffsetFromEntityInWorldCoords(PlayerPedId(), 0.0, -0.5, -0.5) + TaskStartScenarioAtPosition(PlayerPedId(), anim, BehindPlayer.x, BehindPlayer.y, BehindPlayer.z, GetEntityHeading(PlayerPedId()), 0, true, false) + DebugPrint("Playing scenario = (" .. anim .. ")") + else + TaskStartScenarioInPlace(PlayerPedId(), anim, 0, true) + DebugPrint("Playing scenario = (" .. anim .. ")") + end + IsInAnimation = true + RunAnimationThread() + return + end + + -- Small delay at the start + if animOption and animOption.StartDelay then + Wait(animOption.StartDelay) + end + + if not LoadAnim(ChosenDict) then + EmoteChatMessage("'" .. name .. "' " .. Translate('notvalidemote') .. "") + return + end + + local movementType = 0 + + if InVehicle then + if animOption and animOption.FullBody then + movementType = 35 + else + movementType = 51 + end + elseif animOption then + if animOption.EmoteMoving then + movementType = 51 + elseif animOption.EmoteLoop then + movementType = 1 + elseif animOption.EmoteStuck then + movementType = 50 + end + end + + DebugPrint("Animation flag = (" .. movementType .. ")") + + if animOption then + if animOption.PtfxAsset then + Ptfx1, Ptfx2, Ptfx3, Ptfx4, Ptfx5, Ptfx6, PtfxScale = table.unpack(animOption.PtfxPlacement) + PtfxNotif = false + PtfxPrompt = true + RunAnimationThread() + TriggerServerEvent("rpemotes:ptfx:sync", animOption.PtfxAsset, animOption.PtfxName, vector3(Ptfx1, Ptfx2, Ptfx3), + vector3(Ptfx4, Ptfx5, Ptfx6), animOption.PtfxBone, PtfxScale, animOption.PtfxColor) + else + PtfxPrompt = false + end + end + + if IsPedUsingAnyScenario(PlayerPedId()) or IsPedActiveInScenario(PlayerPedId()) then + ClearPedTasksImmediately(PlayerPedId()) + end + + TaskPlayAnim(PlayerPedId(), ChosenDict, anim, animOption?.BlendInSpeed or 5.0, animOption?.BlendOutSpeed or 5.0, animOption?.EmoteDuration or -1, animOption?.Flag or movementType, 0, false, false, + false) + RemoveAnimDict(ChosenDict) + + IsInAnimation = true + RunAnimationThread() + + if not (animOption and animOption.Prop) then + CheckStatusThread(ChosenDict, anim) + end + + local currentEmoteTable = emoteData + for _, tabledata in pairs(RP) do + for command, emotedata in pairs(tabledata) do + if emotedata == emoteData then + table.insert(currentEmoteTable, command) + break + end + end + end + currentEmote = currentEmoteTable + + if animOption and animOption.Prop then + PropPl1, PropPl2, PropPl3, PropPl4, PropPl5, PropPl6 = table.unpack(animOption.PropPlacement) + + Wait(animOption and animOption.EmoteDuration or 0) + + if not AddProp({ + prop1 = animOption.Prop, + bone = animOption.PropBone, + off1 = PropPl1, off2 = PropPl2, off3 = PropPl3, + rot1 = PropPl4, rot2 = PropPl5, rot3 = PropPl6, + textureVariation = textureVariation, + isClone = false, + noCollision = animOption.PropNoCollision + }) then return end + + if animOption.SecondProp then + SecondPropPl1, SecondPropPl2, SecondPropPl3, SecondPropPl4, SecondPropPl5, SecondPropPl6 = table.unpack(animOption.SecondPropPlacement) + if not AddProp({ + prop1 = animOption.SecondProp, + bone = animOption.SecondPropBone, + off1 = SecondPropPl1, off2 = SecondPropPl2, off3 = SecondPropPl3, + rot1 = SecondPropPl4, rot2 = SecondPropPl5, rot3 = SecondPropPl6, + textureVariation = textureVariation, + isClone = false, + noCollision = animOption.SecondPropNoCollision + }) then + DestroyAllProps() + return + end + end + + -- Ptfx is on the prop, then we need to sync it + if not animOption then return end + if animOption.PtfxAsset and not animOption.PtfxNoProp then + TriggerServerEvent("rpemotes:ptfx:syncProp", ObjToNet(attachedProp)) + end + end +end + +function OnEmotePlayClone(name) + if not Config.PreviewPed then return end + + cleanScenarioObjects(true) + + if not DoesEntityExist(ClonedPed) then + return false + end + + if InExitEmote then + return false + end + + if Config.CancelPreviousEmote and not ExitAndPlay and not EmoteCancelPlaying then + ExitAndPlay = true + DebugPrint("Canceling previous emote and playing next emote") + return + end + + local emoteData = RP[name] + local animOption = emoteData.AnimationOptions + + local dict, anim = table.unpack(emoteData) + + if animOption and animOption.Prop then + DestroyAllProps(true) + end + + if dict == "MaleScenario" or dict == "Scenario" or dict == "ScenarioObject" then + CheckGender() + ClearPedTasks(ClonedPed) + DestroyAllProps(true) + if dict == "MaleScenario" then + if PlayerGender == "male" then + TaskStartScenarioInPlace(ClonedPed, anim, 0, true) + end + elseif dict == "ScenarioObject" then + local BehindPlayer = GetOffsetFromEntityInWorldCoords(ClonedPed, 0.0, -0.5, -0.5) + TaskStartScenarioAtPosition(ClonedPed, anim, BehindPlayer.x, BehindPlayer.y, BehindPlayer.z, GetEntityHeading(ClonedPed), 0, true, false) + elseif dict == "Scenario" then + TaskStartScenarioInPlace(ClonedPed, anim, 0, true) + end + return + end + + if not LoadAnim(dict) then + EmoteChatMessage("'" .. name .. "' " .. Translate('notvalidemote') .. "") + return + end + + local movementType = 0 + + if animOption then + if animOption.EmoteMoving then + movementType = 51 + elseif animOption.EmoteLoop then + movementType = 1 + elseif animOption.EmoteStuck then + movementType = 50 + end + end + + if IsPedUsingAnyScenario(ClonedPed) or IsPedActiveInScenario(ClonedPed) then + ClearPedTasksImmediately(ClonedPed) + end + + TaskPlayAnim(ClonedPed, dict, anim, 5.0, 5.0, animOption and animOption.EmoteDuration or -1, animOption?.Flag or movementType, 0, false, false, false) + RemoveAnimDict(dict) + + if animOption and animOption.Prop then + local PropPl1, PropPl2, PropPl3, PropPl4, PropPl5, PropPl6 = table.unpack(animOption.PropPlacement) + + Wait(animOption and animOption.EmoteDuration or 0) + + if not AddProp({ + prop1 = animOption.Prop, + bone = animOption.PropBone, + off1 = PropPl1, off2 = PropPl2, off3 = PropPl3, + rot1 = PropPl4, rot2 = PropPl5, rot3 = PropPl6, + isClone = true, + noCollision = animOption.PropNoCollision + }) then return end + + if animOption.SecondProp then + local SecondPropPl1, SecondPropPl2, SecondPropPl3, SecondPropPl4, SecondPropPl5, SecondPropPl6 = table.unpack(animOption.SecondPropPlacement) + + if not AddProp({ + prop1 = animOption.SecondProp, + bone = animOption.SecondPropBone, + off1 = SecondPropPl1, off2 = SecondPropPl2, off3 = SecondPropPl3, + rot1 = SecondPropPl4, rot2 = SecondPropPl5, rot3 = SecondPropPl6, + isClone = true, + noCollision = animOption.SecondPropNoCollision + }) then + DestroyAllProps(true) + return + end + end + end +end + +function PlayExitAndEnterEmote(name, textureVariation) + local ped = PlayerPedId() + if not CanCancel then return end + if ChosenDict == "MaleScenario" and IsInAnimation then + ClearPedTasksImmediately(ped) + IsInAnimation = false + DebugPrint("Forced scenario exit") + elseif ChosenDict == "Scenario" and IsInAnimation then + ClearPedTasksImmediately(ped) + IsInAnimation = false + DebugPrint("Forced scenario exit") + end + + PtfxNotif = false + PtfxPrompt = false + Pointing = false + + if LocalPlayer.state.ptfx then + PtfxStop() + end + DetachEntity(ped, true, false) + CancelSharedEmote() + + if CurrentAnimOptions?.ExitEmote then + local options = CurrentAnimOptions or {} + + if not RP[options.ExitEmote] then + DebugPrint("Exit emote was invalid") + ClearPedTasks(ped) + IsInAnimation = false + return + end + OnEmotePlay(options.ExitEmote) + DebugPrint("Playing exit animation") + + local animationOptions = RP[options.ExitEmote].AnimationOptions + if animationOptions and animationOptions.EmoteDuration then + InExitEmote = true + SetTimeout(animationOptions.EmoteDuration, function() + InExitEmote = false + DestroyAllProps(true) + ClearPedTasks(ped) + OnEmotePlay(name, textureVariation) + ExitAndPlay = false + end) + return + end + else + ClearPedTasks(ped) + IsInAnimation = false + ExitAndPlay = false + DestroyAllProps(true) + OnEmotePlay(name, CurrentTextureVariation) + end +end + +RegisterNetEvent('animations:client:EmoteCommandStart', function(args) + EmoteCommandStart(args) +end) + +CreateExport("EmoteCommandStart", function(emoteName, textureVariation) + EmoteCommandStart({ emoteName, textureVariation }) +end) +CreateExport("EmoteCancel", EmoteCancel) +CreateExport("CanCancelEmote", function(State) + CanCancel = State == true +end) +CreateExport('IsPlayerInAnim', function() + return LocalPlayer.state.currentEmote +end) +CreateExport('getCurrentEmote', function() + return currentEmote +end) + +-- Door stuff +local openingDoor = false +AddEventHandler('CEventOpenDoor', function(unk1) + if unk1[1] ~= PlayerPedId() then return end + if ShowPed then + return + end + + if not IsInAnimation then + return + end + + if openingDoor then + return + end + + openingDoor = true + + while IsPedOpeningADoor(PlayerPedId()) do + Wait(100) + end + + openingDoor = false + + Wait(200) + + ClearPedTasks(PlayerPedId()) + DestroyAllProps() + OnEmotePlay(CurrentAnimationName, CurrentTextureVariation) +end) + +local isBumpingPed = false +local timeout = 500 + +AddEventHandler("CEventPlayerCollisionWithPed", function(unk1) + if unk1[1] ~= PlayerPedId() then return end + if not IsInAnimation then + return + end + + if isBumpingPed then + timeout = 500 + return + end + isBumpingPed = true + timeout = 500 + -- We wait a bit to avoid collision with the ped resetting the animation again + + while timeout > 0 do + Wait(100) + timeout = timeout - 100 + end + + if not IsInAnimation then + return + end + + isBumpingPed = false + ClearPedTasks(PlayerPedId()) + Wait(125) + DestroyAllProps() + OnEmotePlay(CurrentAnimationName, CurrentTextureVariation) +end) + +AddEventHandler('onResourceStop', function(resource) + if resource ~= GetCurrentResourceName() then return end + local ped = PlayerPedId() + ClosePedMenu() + DestroyAllProps() + ClearPedTasksImmediately(ped) + DetachEntity(ped, true, false) + ResetPedMovementClipset(ped, 0.8) +end) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/EmoteMenu.lua b/resources/[standalone]/rpemotes-reborn/client/EmoteMenu.lua similarity index 57% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/EmoteMenu.lua rename to resources/[standalone]/rpemotes-reborn/client/EmoteMenu.lua index a5f2a87e4..d52c6825f 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/EmoteMenu.lua +++ b/resources/[standalone]/rpemotes-reborn/client/EmoteMenu.lua @@ -27,39 +27,16 @@ local _menuPool = NativeUI.CreatePool() local mainMenu = NativeUI.CreateMenu(Config.MenuTitle or "", "", menuPosition["x"], menuPosition["y"], menuHeader, menuHeader) _menuPool:Add(mainMenu) -local sharemenu, shareddancemenu, favmenu, infomenu +local sharemenu, shareddancemenu, infomenu local EmoteTable = {} -local FavEmoteTable = {} local DanceTable = {} local AnimalTable = {} -local PropETable = {} +local PropTable = {} local WalkTable = {} local FaceTable = {} local ShareTable = {} -local FavoriteEmote = "" -if Config.FavKeybindEnabled then - RegisterCommand('emotefav', function() FavKeybind() end, false) - RegisterKeyMapping("emotefav", Translate("register_fav_anim"), "keyboard", Config.FavKeybind) - - local doingFavoriteEmote = false - - function FavKeybind() - if doingFavoriteEmote == false then - doingFavoriteEmote = true - if not IsPedSittingInAnyVehicle(PlayerPedId()) then - if FavoriteEmote ~= "" and (not CanUseFavKeyBind or CanUseFavKeyBind()) then - EmoteCommandStart(nil, { FavoriteEmote, 0 }) - Wait(500) - end - end - else - EmoteCancel() - doingFavoriteEmote = false - end - end -end function AddEmoteMenu(menu) local submenu = _menuPool:AddSubMenu(menu, Translate('emotes'), "", true, true) @@ -85,17 +62,7 @@ function AddEmoteMenu(menu) table.insert(EmoteTable, Translate('shareemotes')) end - -- Temp var to be able to sort every emotes in the fav list - local favEmotes = {} - if not Config.Keybinding then - favmenu = _menuPool:AddSubMenu(submenu, Translate('favoriteemotes'), Translate('favoriteinfo'), true, true) - favmenu:AddItem(NativeUI.CreateItem(Translate('prop2info'), "")) - favmenu:AddItem(NativeUI.CreateItem(Translate('rfavorite'), Translate('rfavorite'))) - -- Add two elements as offset - table.insert(FavEmoteTable, Translate('rfavorite')) - table.insert(FavEmoteTable, Translate('rfavorite')) - table.insert(EmoteTable, Translate('favoriteemotes')) - else + if Config.Keybinding then table.insert(EmoteTable, "keybinds") submenu:AddItem(NativeUI.CreateItem(Translate('keybinds'), Translate('keybindsinfo') .. " /emotebind [~y~num4-9~w~] [~g~emotename~w~]")) end @@ -104,120 +71,84 @@ function AddEmoteMenu(menu) local x, y, z = table.unpack(b) submenu:AddItem(NativeUI.CreateItem(z, "/e (" .. a .. ")")) table.insert(EmoteTable, a) - if not Config.Keybinding then - favEmotes[a] = z - end end for a, b in PairsByKeys(RP.Dances) do - local x, y, z = table.unpack(b) - dancemenu:AddItem(NativeUI.CreateItem(z, "/e (" .. a .. ")")) + local name = '๐Ÿคผ ' .. b[3] + dancemenu:AddItem(NativeUI.CreateItem(name, "/e (" .. a .. ")")) if Config.SharedEmotesEnabled then - shareddancemenu:AddItem(NativeUI.CreateItem(z, "/nearby (" .. a .. ")")) + shareddancemenu:AddItem(NativeUI.CreateItem(name, "/nearby (" .. a .. ")")) end table.insert(DanceTable, a) - if not Config.Keybinding then - favEmotes[a] = z - end end if Config.AnimalEmotesEnabled then for a, b in PairsByKeys(RP.AnimalEmotes) do - local x, y, z = table.unpack(b) - animalmenu:AddItem(NativeUI.CreateItem(z, "/e (" .. a .. ")")) + local name = '๐Ÿถ ' .. b[3] + animalmenu:AddItem(NativeUI.CreateItem(name, "/e (" .. a .. ")")) table.insert(AnimalTable, a) - if not Config.Keybinding then - favEmotes[a] = z - end end end if Config.SharedEmotesEnabled then for a, b in PairsByKeys(RP.Shared) do - local x, y, z, otheremotename = table.unpack(b) - local shareitem = NativeUI.CreateItem(z, "/nearby (~g~" .. a .. "~w~)" .. (otheremotename and " " .. Translate('makenearby') .. " (~y~" .. otheremotename .. "~w~)" or "")) + local name = b[3] + local shareitem = NativeUI.CreateItem(name, "/nearby (~g~" .. a .. "~w~)" .. (otheremotename and " " .. Translate('makenearby') .. " (~y~" .. otheremotename .. "~w~)" or "")) sharemenu:AddItem(shareitem) table.insert(ShareTable, a) end end for a, b in PairsByKeys(RP.PropEmotes) do - local x, y, z = table.unpack(b) + local name = '๐Ÿ“ฆ ' .. b[3] local propitem = b.AnimationOptions.PropTextureVariations and - NativeUI.CreateListItem(z, b.AnimationOptions.PropTextureVariations, 1, "/e (" .. a .. ")") or - NativeUI.CreateItem(z, "/e (" .. a .. ")") + NativeUI.CreateListItem(name, b.AnimationOptions.PropTextureVariations, 1, "/e (" .. a .. ")") or + NativeUI.CreateItem(name, "/e (" .. a .. ")") propmenu:AddItem(propitem) - table.insert(PropETable, a) - if not Config.Keybinding then - favEmotes[a] = z - end + table.insert(PropTable, a) end - if not Config.Keybinding then - -- Add the emotes to the fav menu - for emoteName, emoteLabel in PairsByKeys(favEmotes) do - favmenu:AddItem(NativeUI.CreateItem(emoteLabel, Translate('set') .. emoteLabel .. Translate('setboundemote'))) - table.insert(FavEmoteTable, emoteName) - end - - favmenu.OnItemSelect = function(sender, item, index) - if FavEmoteTable[index] == Translate('rfavorite') then - FavoriteEmote = "" - SimpleNotify(Translate('rfavorite')) - return - end - if Config.FavKeybindEnabled then - FavoriteEmote = FavEmoteTable[index] - SimpleNotify("~o~" .. FirstToUpper(FavoriteEmote) .. Translate('newsetemote')) - end - end - end - favEmotes = nil - -- Ped Emote on Change Index - dancemenu.OnIndexChange = function(menu, newindex) + dancemenu.OnIndexChange = function(_, newindex) ClearPedTaskPreview() - EmoteMenuStartClone(DanceTable[newindex], "dances") + EmoteMenuStartClone(DanceTable[newindex], "Dances") end - propmenu.OnIndexChange = function(menu, newindex) + propmenu.OnIndexChange = function(_, newindex) ClearPedTaskPreview() - EmoteMenuStartClone(PropETable[newindex], "props") + EmoteMenuStartClone(PropTable[newindex], "PropEmotes") end - submenu.OnIndexChange = function(menu, newindex) - if newindex > 6 then + submenu.OnIndexChange = function(_, newindex) + if newindex > 5 then ClearPedTaskPreview() - EmoteMenuStartClone(EmoteTable[newindex], "emotes") + EmoteMenuStartClone(EmoteTable[newindex], "Emotes") end end - dancemenu.OnMenuClosed = function(menu) + dancemenu.OnMenuClosed = function() ClearPedTaskPreview() end - -------- - - - dancemenu.OnItemSelect = function(sender, item, index) - EmoteMenuStart(DanceTable[index], "dances") + dancemenu.OnItemSelect = function(_, _, index) + EmoteMenuStart(DanceTable[index], "Dances") end if Config.AnimalEmotesEnabled then - animalmenu.OnItemSelect = function(sender, item, index) - EmoteMenuStart(AnimalTable[index], "animals") + animalmenu.OnItemSelect = function(_, _, index) + EmoteMenuStart(AnimalTable[index], "AnimalEmotes") end end if Config.SharedEmotesEnabled then - sharemenu.OnItemSelect = function(sender, item, index) + sharemenu.OnItemSelect = function(_, _, index) if ShareTable[index] ~= 'none' then local target, distance = GetClosestPlayer() if (distance ~= -1 and distance < 3) then - TriggerServerEvent("ServerEmoteRequest", GetPlayerServerId(target), ShareTable[index]) + TriggerServerEvent("rpemotes:server:requestEmote", GetPlayerServerId(target), ShareTable[index]) SimpleNotify(Translate('sentrequestto') .. GetPlayerName(target)) else SimpleNotify(Translate('nobodyclose')) @@ -225,10 +156,10 @@ function AddEmoteMenu(menu) end end - shareddancemenu.OnItemSelect = function(sender, item, index) + shareddancemenu.OnItemSelect = function(_, _, index) local target, distance = GetClosestPlayer() if (distance ~= -1 and distance < 3) then - TriggerServerEvent("ServerEmoteRequest", GetPlayerServerId(target), DanceTable[index], 'Dances') + TriggerServerEvent("rpemotes:server:requestEmote", GetPlayerServerId(target), DanceTable[index], 'Dances') SimpleNotify(Translate('sentrequestto') .. GetPlayerName(target)) else SimpleNotify(Translate('nobodyclose')) @@ -236,23 +167,23 @@ function AddEmoteMenu(menu) end end - propmenu.OnItemSelect = function(sender, item, index) - EmoteMenuStart(PropETable[index], "props") + propmenu.OnItemSelect = function(_, _, index) + EmoteMenuStart(PropTable[index], "PropEmotes") end - propmenu.OnListSelect = function(menu, item, itemIndex, listIndex) - EmoteMenuStart(PropETable[itemIndex], "props", item:IndexToItem(listIndex).Value) + propmenu.OnListSelect = function(_, item, itemIndex, listIndex) + EmoteMenuStart(PropTable[itemIndex], "PropEmotes", item:IndexToItem(listIndex).Value) end - submenu.OnItemSelect = function(sender, item, index) + submenu.OnItemSelect = function(_, _, index) if Config.Search and EmoteTable[index] == Translate('searchemotes') then EmoteMenuSearch(submenu) - elseif EmoteTable[index] ~= Translate('favoriteemotes') then - EmoteMenuStart(EmoteTable[index], "emotes") + else + EmoteMenuStart(EmoteTable[index], "Emotes") end end - submenu.OnMenuClosed = function(menu) + submenu.OnMenuClosed = function() if not isSearching then ClosePedMenu() end @@ -269,7 +200,6 @@ if Config.Search then function EmoteMenuSearch(lastMenu) ClosePedMenu() - local favEnabled = not Config.Keybinding and Config.FavKeybindEnabled AddTextEntry("PM_NAME_CHALL", Translate('searchinputtitle')) DisplayOnscreenKeyboard(1, "PM_NAME_CHALL", "", "", "", "", "", 30) while UpdateOnscreenKeyboard() == 0 do @@ -279,12 +209,10 @@ if Config.Search then local input = GetOnscreenKeyboardResult() if input ~= nil then local results = {} - for k, v in pairs(RP) do - if not ignoredCategories[k] then - for a, b in pairs(v) do - if string.find(string.lower(a), string.lower(input)) or (b[3] ~= nil and string.find(string.lower(b[3]), string.lower(input))) then - table.insert(results, {table = k, name = a, data = b}) - end + for a, b in pairs(RP) do + if not ignoredCategories[b.category] then + if string.find(string.lower(a), string.lower(input)) or (b[3] ~= nil and string.find(string.lower(b[3]), string.lower(input))) then + table.insert(results, { table = b.category, name = a, data = b }) end end end @@ -294,9 +222,6 @@ if Config.Search then local searchMenu = _menuPool:AddSubMenu(lastMenu, string.format('%s '..Translate('searchmenudesc')..' ~r~%s~w~', #results, input), "", true, true) local sharedDanceMenu - if favEnabled then - searchMenu:AddItem(NativeUI.CreateItem(Translate('rfavorite'), Translate('rfavorite'))) - end if Config.SharedEmotesEnabled then sharedDanceMenu = _menuPool:AddSubMenu(searchMenu, Translate('sharedanceemotes'), "", true, true) @@ -313,7 +238,7 @@ if Config.Search then desc = "/nearby (~g~" .. v.name .. "~w~) " .. Translate('makenearby') .. " (~y~" .. otheremotename .. "~w~)" end else - desc = "/e (" .. v.name .. ")" .. (favEnabled and "\n" .. Translate('searchshifttofav') or "") + desc = "/e (" .. v.name .. ")" end if v.data.AnimationOptions and v.data.AnimationOptions.PropTextureVariations then @@ -327,79 +252,52 @@ if Config.Search then end end - if favEnabled then - table.insert(results, 1, Translate('rfavorite')) - end - - - searchMenu.OnMenuChanged = function(menu, newmenu, forward) + searchMenu.OnMenuChanged = function() isSearching = false ShowPedMenu() end - searchMenu.OnIndexChange = function(menu, newindex) + searchMenu.OnIndexChange = function(_, newindex) local data = results[newindex] ClearPedTaskPreview() - if data.table == "Emotes" or data.table == "Dances" then - EmoteMenuStartClone(data.name, string.lower(data.table)) - elseif data.table == "PropEmotes" then - EmoteMenuStartClone(data.name, "props") - elseif data.table == "AnimalEmotes" then - EmoteMenuStartClone(data.name, "animals") - end + EmoteMenuStartClone(data.name, data.data.category) end - searchMenu.OnItemSelect = function(sender, item, index) + searchMenu.OnItemSelect = function(_, _, index) local data = results[index] if data == Translate('sharedanceemotes') then return end - if data == Translate('rfavorite') then - FavoriteEmote = "" - SimpleNotify(Translate('rfavorite')) - return - end - if favEnabled and IsControlPressed(0, 21) then - if data.table ~= "Shared" then - FavoriteEmote = data.name - SimpleNotify("~o~" .. FirstToUpper(data.name) .. Translate('newsetemote')) - else - SimpleNotify(Translate('searchcantsetfav')) - end - elseif data.table == "Emotes" or data.table == "Dances" then - EmoteMenuStart(data.name, string.lower(data.table)) - elseif data.table == "PropEmotes" then - EmoteMenuStart(data.name, "props") - elseif data.table == "AnimalEmotes" then - EmoteMenuStart(data.name, "animals") - elseif data.table == "Shared" then + if data.table == "Shared" then local target, distance = GetClosestPlayer() if (distance ~= -1 and distance < 3) then - TriggerServerEvent("ServerEmoteRequest", GetPlayerServerId(target), data.name) + TriggerServerEvent("rpemotes:server:requestEmote", GetPlayerServerId(target), data.name) SimpleNotify(Translate('sentrequestto') .. GetPlayerName(target)) else SimpleNotify(Translate('nobodyclose')) end + else + EmoteMenuStart(data.name, data.data.category) end end - searchMenu.OnListSelect = function(menu, item, itemIndex, listIndex) - EmoteMenuStart(results[itemIndex].name, "props", item:IndexToItem(listIndex).Value) + searchMenu.OnListSelect = function(_, item, itemIndex, listIndex) + EmoteMenuStart(results[itemIndex].name, "PropEmotes", item:IndexToItem(listIndex).Value) end if Config.SharedEmotesEnabled then if #sharedDanceMenu.Items > 0 then - table.insert(results, (favEnabled and 2 or 1), Translate('sharedanceemotes')) - sharedDanceMenu.OnItemSelect = function(sender, item, index) + table.insert(results, 1, Translate('sharedanceemotes')) + sharedDanceMenu.OnItemSelect = function(_, _, index) if not LocalPlayer.state.canEmote then return end local data = results[index] local target, distance = GetClosestPlayer() if (distance ~= -1 and distance < 3) then - TriggerServerEvent("ServerEmoteRequest", GetPlayerServerId(target), data.name, 'Dances') + TriggerServerEvent("rpemotes:server:requestEmote", GetPlayerServerId(target), data.name, 'Dances') SimpleNotify(Translate('sentrequestto') .. GetPlayerName(target)) else SimpleNotify(Translate('nobodyclose')) @@ -407,7 +305,7 @@ if Config.Search then end else sharedDanceMenu:Clear() - searchMenu:RemoveItemAt((favEnabled and 2 or 1)) + searchMenu:RemoveItemAt(1) end end @@ -439,8 +337,8 @@ function AddCancelEmote(menu) end ShowPedPreview = function(menu) - menu.OnItemSelect = function(sender, item, index) - if (index == 1) then + menu.OnItemSelect = function(_, _, index) + if index == 1 then isSearching = false ShowPedMenu() elseif index == 4 then @@ -458,20 +356,19 @@ function AddWalkMenu(menu) local sortedWalks = {} for a, b in PairsByKeys(RP.Walks) do - local x, label = table.unpack(b) - if x == "move_m@injured" then - table.insert(sortedWalks, 1, {label = label or a, anim = x}) + if b[1] == "move_m@injured" then + table.insert(sortedWalks, 1, {label = a, anim = b[1]}) else - table.insert(sortedWalks, {label = label or a, anim = x}) + table.insert(sortedWalks, {label = a, anim = b[1]}) end end for _, walk in ipairs(sortedWalks) do submenu:AddItem(NativeUI.CreateItem(walk.label, "/walk (" .. string.lower(walk.label) .. ")")) - table.insert(WalkTable, walk.anim) + table.insert(WalkTable, walk.label) end - submenu.OnItemSelect = function(sender, item, index) + submenu.OnItemSelect = function(_, item, index) if item == walkreset then ResetWalk() DeleteResourceKvp("walkstyle") @@ -495,26 +392,26 @@ function AddFaceMenu(menu) end - submenu.OnMenuClosed = function(menu) - ClosePedMenu() + submenu.OnIndexChange = function(_, newindex) + EmoteMenuStartClone(FaceTable[newindex], "Expressions") end - submenu.OnIndexChange = function(menu, newindex) - EmoteMenuStartClone(FaceTable[newindex], "expression") - end - - submenu.OnItemSelect = function(sender, item, index) - if item ~= facereset then - EmoteMenuStart(FaceTable[index], "expression") - else - DeleteResourceKvp("expression") + submenu.OnItemSelect = function(_, item, index) + if item == facereset then + DeleteResourceKvp("Expressions") ClearFacialIdleAnimOverride(PlayerPedId()) + else + EmoteMenuStart(FaceTable[index], "Expressions") end end + + submenu.OnMenuClosed = function() + ClosePedMenu() + end end function AddInfoMenu(menu) - infomenu = _menuPool:AddSubMenu(menu, Translate('infoupdate'), "~h~~y~The RPEmotes Team & Collaborators~h~~y~", true, true) + infomenu = _menuPool:AddSubMenu(menu, Translate('infoupdate'), "~h~~y~The RPEmotes Developers~h~~y~", true, true) for _,v in ipairs(Config.Credits) do local item = NativeUI.CreateItem(v.title,v.subtitle or "") @@ -549,21 +446,51 @@ function OpenEmoteMenu() end end -LoadAddonEmotes() -AddEmoteMenu(mainMenu) -AddCancelEmote(mainMenu) -if Config.PreviewPed then - ShowPedPreview(mainMenu) -end -if Config.WalkingStylesEnabled then - AddWalkMenu(mainMenu) -end -if Config.ExpressionsEnabled then - AddFaceMenu(mainMenu) -end -AddInfoMenu(mainMenu) +CreateThread(function() + LoadAddonEmotes() + AddEmoteMenu(mainMenu) + AddCancelEmote(mainMenu) + if Config.PreviewPed then + ShowPedPreview(mainMenu) + end + if Config.WalkingStylesEnabled then + AddWalkMenu(mainMenu) + end + if Config.ExpressionsEnabled then + AddFaceMenu(mainMenu) + end + AddInfoMenu(mainMenu) -_menuPool:RefreshIndex() + _menuPool:RefreshIndex() + + local newRP = {} + for emoteType, content in pairs(RP) do + for emoteName, emoteData in pairs(content) do + local shouldRemove = false + + if Config.AdultEmotesDisabled and emoteData.AdultAnimation then + shouldRemove = true + end + if newRP[emoteName] then + print('WARNING - Duplicate emote name found: ' .. emoteName .. ' in ' .. emoteType .. ' and ' .. newRP[emoteName].category) + end + if shouldRemove then + elseif type(emoteData) == "table" then + newRP[emoteName] = {} + for k, v in pairs(emoteData) do + newRP[emoteName][k] = v + end + newRP[emoteName].category = emoteType + else + newRP[emoteName] = { emoteData } + newRP[emoteName].category = emoteType + end + end + newRP[emoteType] = nil + end + RP = newRP + CONVERTED = true +end) local isMenuProcessing = false function ProcessMenu() @@ -576,17 +503,6 @@ function ProcessMenu() isMenuProcessing = false end -RegisterNetEvent("rp:Update", function(state) - UpdateAvailable = state - AddInfoMenu(mainMenu) - _menuPool:RefreshIndex() -end) - -RegisterNetEvent("rp:RecieveMenu", function() - OpenEmoteMenu() -end) - - -- While ped is dead, don't show menus CreateThread(function() while true do diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Expressions.lua b/resources/[standalone]/rpemotes-reborn/client/Expressions.lua similarity index 58% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/Expressions.lua rename to resources/[standalone]/rpemotes-reborn/client/Expressions.lua index c9c0ee7fc..1dd91f5bc 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Expressions.lua +++ b/resources/[standalone]/rpemotes-reborn/client/Expressions.lua @@ -1,46 +1,37 @@ function SetPlayerPedExpression(expression, saveToKvp) - SetFacialIdleAnimOverride(PlayerPedId(), expression, 0) - if Config.PersistentExpression and saveToKvp then SetResourceKvp("expression", expression) end -end - -local function DisplayExpressions() - local moodsString = "" - for name, _ in pairs(RP.Expressions) do - moodsString = moodsString .. string.lower(name) .. ", " + local emote = RP[expression] + if emote and emote.category == "Expressions" then + SetFacialIdleAnimOverride(PlayerPedId(), emote[1], 0) + if Config.PersistentExpression and saveToKvp then SetResourceKvp("expression", emote[1]) end + else + ClearFacialIdleAnimOverride(PlayerPedId()) + DeleteResourceKvp("expression") end - - EmoteChatMessage(moodsString) - EmoteChatMessage("To reset do /mood reset") end if Config.ExpressionsEnabled then RegisterCommand('mood', function(_source, args, _raw) local expression = FirstToUpper(string.lower(args[1])) - if RP.Expressions[expression] ~= nil then - SetPlayerPedExpression(RP.Expressions[expression][1], true) + local emote = RP[expression] + if emote and emote.category == "Expressions" then + SetPlayerPedExpression(RP[expression][1], true) elseif expression == "Reset" then ClearFacialIdleAnimOverride(PlayerPedId()) DeleteResourceKvp("expression") else - EmoteChatMessage("'" .. expression .. "' is not a valid mood, do /moods to see all moods.") + EmoteChatMessage("'" .. expression .. "' is not a valid mood") end end, false) - RegisterCommand('moods', function() - DisplayExpressions() - end, false) - - -- Chat Suggestions TriggerEvent('chat:addSuggestion', '/mood', 'Set your current mood/expression.', { { name = "expression", help = "/moods for a list of valid moods" } }) TriggerEvent('chat:addSuggestion', '/moods', 'List available walking moods/expressions.') - -- Load the expression once the player has spawned. Standalone, QBCore and ESX -- local function LoadPersistentExpression() local expression = GetResourceKvpString("expression") if expression then - Wait(2500) -- Delay, to ensure the player ped has loaded in + Wait(2500) SetPlayerPedExpression(expression, false) end end @@ -50,4 +41,10 @@ if Config.ExpressionsEnabled then RegisterNetEvent('QBCore:Client:OnPlayerLoaded', LoadPersistentExpression) RegisterNetEvent('esx:playerLoaded', LoadPersistentExpression) end + + AddEventHandler('onResourceStart', function(resource) + if resource == GetCurrentResourceName() then + LoadPersistentExpression() + end + end) end diff --git a/resources/[standalone]/rpemotes-reborn/client/Handsup.lua b/resources/[standalone]/rpemotes-reborn/client/Handsup.lua new file mode 100644 index 000000000..15f6afdd6 --- /dev/null +++ b/resources/[standalone]/rpemotes-reborn/client/Handsup.lua @@ -0,0 +1,86 @@ +local function HandsUpLoop() + CreateThread(function() + while InHandsup do + if Config.DisabledHandsupControls then + for control, state in pairs(Config.DisabledHandsupControls) do + DisableControlAction(0, control, state) + end + end + + if IsPlayerAiming(PlayerId()) then + ClearPedSecondaryTask(PlayerPedId()) + CreateThread(function() + Wait(350) + InHandsup = false + end) + end + + Wait(0) + end + end) +end + +if Config.HandsupEnabled then + local function ToggleHandsUp(commandType) + RegisterCommand(commandType, function() + if IsPedInAnyVehicle(PlayerPedId(), false) and not Config.HandsupInCar and not InHandsup then + return + end + Handsup() + end, false) + end + + if Config.HoldToHandsUp then + ToggleHandsUp('+handsup') + ToggleHandsUp('-handsup') + else + ToggleHandsUp('handsup') + end + + function Handsup() + local playerPed = PlayerPedId() + if not IsPedHuman(playerPed) then + return + end + if IsInActionWithErrorMessage() then + return + end + + InHandsup = not InHandsup + if InHandsup then + LocalPlayer.state:set('currentEmote', 'handsup', true) + DestroyAllProps() + local dict = "random@mugging3" + RequestAnimDict(dict) + while not HasAnimDictLoaded(dict) do + Wait(0) + end + TaskPlayAnim(PlayerPedId(), dict, "handsup_standing_base", 3.0, 3.0, -1, 49, 0, false, + IsThisModelABike(GetEntityModel(GetVehiclePedIsIn(PlayerPedId(), false))) and 4127 or false, false) + HandsUpLoop() + else + LocalPlayer.state:set('currentEmote', nil, true) + ClearPedSecondaryTask(PlayerPedId()) + if Config.ReplayEmoteAfterHandsup and IsInAnimation then + local emote = RP[CurrentAnimationName] + if not emote then + return + end + + Wait(400) + DestroyAllProps() + OnEmotePlay(CurrentAnimationName, CurrentTextureVariation) + end + end + end + + TriggerEvent('chat:addSuggestion', '/handsup', Translate('handsup')) + + if Config.HandsupKeybindEnabled then + RegisterKeyMapping("handsup", Translate('register_handsup'), "keyboard", Config.HandsupKeybind) + end + + CreateExport('IsPlayerInHandsUp', function() + return InHandsup + end) +end \ No newline at end of file diff --git a/resources/[standalone]/rpemotes-reborn/client/Keybinds.lua b/resources/[standalone]/rpemotes-reborn/client/Keybinds.lua new file mode 100644 index 000000000..b8c508a26 --- /dev/null +++ b/resources/[standalone]/rpemotes-reborn/client/Keybinds.lua @@ -0,0 +1,96 @@ +CreateThread(function() + TriggerEvent('chat:addSuggestion', '/e', Translate('play_emote'), + { { name = "emotename", help = Translate('help_command') }, + { name = "texturevariation", help = Translate('help_variation') } }) + TriggerEvent('chat:addSuggestion', '/emote', Translate('play_emote'), + { { name = "emotename", help = Translate('help_command') }, + { name = "texturevariation", help = Translate('help_variation') } }) + if Config.Keybinding then + TriggerEvent('chat:addSuggestion', '/emotebind', Translate('link_emote_keybind'), + { { name = "key", help = "num4, num5, num6, num7. num8, num9. Numpad 4-9!" }, + { name = "emotename", help = Translate('help_command') } }) + TriggerEvent('chat:addSuggestion', '/emotebinds', Translate('show_emote_keybind')) + TriggerEvent('chat:addSuggestion', '/emotedelete', Translate('remove_emote_keybind'), + { { name = "key", help = "num4, num5, num6, num7. num8, num9. Numpad 4-9!" } }) + end + TriggerEvent('chat:addSuggestion', '/emotemenu', Translate('open_menu_emote')) + TriggerEvent('chat:addSuggestion', '/emotes', Translate('show_list_emote')) + TriggerEvent('chat:addSuggestion', '/emotecancel', Translate('cancel_emote')) +end) + +RegisterCommand('e', function(source, args, raw) EmoteCommandStart(args) end, false) +RegisterCommand('emote', function(source, args, raw) EmoteCommandStart(args) end, false) +RegisterCommand('emotecancel', function() EmoteCancel() end, false) + +if Config.MenuKeybindEnabled then + RegisterCommand('emoteui', function() OpenEmoteMenu() end, false) + RegisterKeyMapping("emoteui", Translate('register_open_menu'), "keyboard", Config.MenuKeybind) +else + RegisterCommand('emotemenu', function() OpenEmoteMenu() end, false) +end + +if Config.EnableCancelKeybind then + RegisterKeyMapping("emotecancel", Translate('register_cancel_emote'), "keyboard", Config.CancelEmoteKey) +end + +-- BINDING EMOTES TO KEYS +if Config.Keybinding then + RegisterCommand('emotebind', function(source, args, raw) EmoteBindStart(source, args, raw) end, false) + RegisterCommand('emotebinds', function(source, args, raw) ListKeybinds() end, false) + RegisterCommand('emotedelete', function(source, args) DeleteEmote(args) end, false) + + for i = 1, #Config.KeybindKeys do + local cmd = string.format('emoteSelect%s', i) + RegisterCommand(cmd, function() + local emote = GetResourceKvpString(string.format('%s_emob%s', Config.keybindKVP, i)) + if emote and emote ~= "" then + EmoteCommandStart({ emote, 0 }) + end + end, false) + RegisterKeyMapping(cmd, string.format('Emote bind %s', i), 'keyboard', Config.KeybindKeys[i]) + end + + function EmoteBindStart(source, args, raw) + if #args > 0 then + local numkey = tonumber(args[1]) + local emote = string.lower(args[2]) + if not (numkey and emote) then + DebugPrint('Invalid arguments to EmoteBindStart') + return + end + if type(numkey) == "number" then + if RP[emote] then + SetResourceKvp(string.format('%s_emob%s', Config.keybindKVP, numkey), emote) + else + EmoteChatMessage("'" .. emote .. "' " .. Translate('notvalidemote') .. "") + end + else + EmoteChatMessage("'" .. numkey .. "' " .. Translate('notvalidkey')) + end + else + DebugPrint('Invalid number of arguments to EmoteBindStart') + end + end + + function ListKeybinds() + for i = 1, #Config.KeybindKeys do + local emote = GetResourceKvpString(string.format('%s_emob%s', Config.keybindKVP, i)) + if emote then + EmoteChatMessage(string.format('Emote %s : %s',i, emote)) + end + end + end + + function DeleteEmote(args) + if #args > 0 then + local numkey = tonumber(args[1]) + if type(numkey) == "number" then + DeleteResourceKvp(string.format('%s_emob%s', Config.keybindKVP, numkey)) + else + EmoteChatMessage("'" .. numkey .. "' " .. Translate('notvalidkey')) + end + else + DebugPrint("invalid") + end + end +end diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/NewsCam.lua b/resources/[standalone]/rpemotes-reborn/client/NewsCam.lua similarity index 99% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/NewsCam.lua rename to resources/[standalone]/rpemotes-reborn/client/NewsCam.lua index bab90a564..403e8ab10 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/NewsCam.lua +++ b/resources/[standalone]/rpemotes-reborn/client/NewsCam.lua @@ -239,7 +239,7 @@ if Config.NewscamEnabled then end end) - exports('toggleNewscam', function() + CreateExport('toggleNewscam', function() UseNewscam() end) end diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/NoIdleCam.lua b/resources/[standalone]/rpemotes-reborn/client/NoIdleCam.lua similarity index 95% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/NoIdleCam.lua rename to resources/[standalone]/rpemotes-reborn/client/NoIdleCam.lua index 4921bb708..21fc5f38d 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/NoIdleCam.lua +++ b/resources/[standalone]/rpemotes-reborn/client/NoIdleCam.lua @@ -1,4 +1,4 @@ -if not Config.NoIdleCam then return end +if not Config.DisableIdleCam then return end RegisterCommand('idlecamoff', function() -- help2 31, 167, 9 TriggerEvent('chat:addMessage', { diff --git a/resources/[standalone]/rpemotes-reborn/client/PTFX.lua b/resources/[standalone]/rpemotes-reborn/client/PTFX.lua new file mode 100644 index 000000000..19a7dc2ea --- /dev/null +++ b/resources/[standalone]/rpemotes-reborn/client/PTFX.lua @@ -0,0 +1,65 @@ +local PlayerParticles = {} + +function PtfxThis(asset) + while not HasNamedPtfxAssetLoaded(asset) do + RequestNamedPtfxAsset(asset) + Wait(10) + end + UseParticleFxAsset(asset) +end + +function PtfxStart() + LocalPlayer.state:set('ptfx', true, true) +end + +function PtfxStop() + LocalPlayer.state:set('ptfx', nil, true) +end + +AddStateBagChangeHandler('ptfx', '', function(bagName, key, value, _unused, replicated) + local plyId = tonumber(bagName:gsub('player:', ''), 10) + + if (PlayerParticles[plyId] and value) or (not PlayerParticles[plyId] and not value) then return end + + local ply = GetPlayerFromServerId(plyId) + if ply <= 0 then return end + + local plyPed = GetPlayerPed(ply) + if not DoesEntityExist(plyPed) then return end + + local stateBag = Player(plyId).state + + if value then + local boneIndex = stateBag.ptfxBone and GetPedBoneIndex(plyPed, stateBag.ptfxBone) or GetEntityBoneIndexByName(stateBag.ptfxName, "VFX") + local entityTarget = plyPed + + if stateBag.ptfxPropNet then + local propObj = NetToObj(stateBag.ptfxPropNet) + if DoesEntityExist(propObj) then + entityTarget = propObj + end + end + + PtfxThis(stateBag.ptfxAsset) + + local offset = stateBag.ptfxOffset + local rot = stateBag.ptfxRot + PlayerParticles[plyId] = StartNetworkedParticleFxLoopedOnEntityBone(stateBag.ptfxName, entityTarget, offset.x, offset.y, offset.z, rot.x, rot.y, rot.z, boneIndex, (stateBag.ptfxScale or 1) + 0.0, false, false, false) + + local color = stateBag.ptfxColor + if color then + if color[1] and type(color[1]) == 'table' then + local randomIndex = math.random(1, #color) + color = color[randomIndex] + end + SetParticleFxLoopedAlpha(PlayerParticles[plyId], color.A) + SetParticleFxLoopedColour(PlayerParticles[plyId], color.R / 255, color.G / 255, color.B / 255, false) + end + DebugPrint("Started PTFX: " .. PlayerParticles[plyId]) + else + DebugPrint("Stopped PTFX: " .. PlayerParticles[plyId]) + StopParticleFxLooped(PlayerParticles[plyId], false) + RemoveNamedPtfxAsset(stateBag.ptfxAsset) + PlayerParticles[plyId] = nil + end +end) \ No newline at end of file diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Pointing.lua b/resources/[standalone]/rpemotes-reborn/client/Pointing.lua similarity index 90% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/Pointing.lua rename to resources/[standalone]/rpemotes-reborn/client/Pointing.lua index f15caab49..578c4d932 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Pointing.lua +++ b/resources/[standalone]/rpemotes-reborn/client/Pointing.lua @@ -23,15 +23,15 @@ local function PointingStopped() ClearPedSecondaryTask(playerPed) end RemoveAnimDict("anim@mp_point") - if Config.PersistentEmoteAfterPointing and IsInAnimation then - local emote = RP.Emotes[CurrentAnimationName] or RP.PropEmotes[CurrentAnimationName] or RP.Dances[CurrentAnimationName] or RP.AnimalEmotes[CurrentAnimationName] + if Config.ReplayEmoteAfterPointing and IsInAnimation then + local emote = RP[CurrentAnimationName] if not emote then return end Wait(400) DestroyAllProps() - OnEmotePlay(emote, CurrentAnimationName, CurrentTextureVariation) + OnEmotePlay(CurrentAnimationName, CurrentTextureVariation) end end @@ -103,7 +103,7 @@ end -- Commands & KeyMapping -- if Config.PointingEnabled then RegisterCommand('pointing', function() - if IsPedInAnyVehicle(PlayerPedId(), false) and not Config.PointingKeybindInCarEnabled then + if IsPedInAnyVehicle(PlayerPedId(), false) and not Config.PointingInCar then return end StartPointing() @@ -117,11 +117,8 @@ if Config.PointingEnabled then end --- Exports -- - ---@return boolean local function IsPlayerPointing() return Pointing end - -exports('IsPlayerPointing', IsPlayerPointing) +CreateExport('IsPlayerPointing', IsPlayerPointing) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Ragdoll.lua b/resources/[standalone]/rpemotes-reborn/client/Ragdoll.lua similarity index 96% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/Ragdoll.lua rename to resources/[standalone]/rpemotes-reborn/client/Ragdoll.lua index 06cb09a76..4cbcb3e45 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Ragdoll.lua +++ b/resources/[standalone]/rpemotes-reborn/client/Ragdoll.lua @@ -16,7 +16,7 @@ if Config.RagdollEnabled then isRagdolling = true end - while not isRagdolling do + while isRagdolling do ped = PlayerPedId() SetPedRagdollForceFall(ped) ResetPedRagdollTimer(ped) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Syncing.lua b/resources/[standalone]/rpemotes-reborn/client/Syncing.lua similarity index 67% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/Syncing.lua rename to resources/[standalone]/rpemotes-reborn/client/Syncing.lua index 7f1c27df9..88f3c8893 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Syncing.lua +++ b/resources/[standalone]/rpemotes-reborn/client/Syncing.lua @@ -1,5 +1,4 @@ local isRequestAnim = false -local requestedemote = '' local targetPlayerId if Config.SharedEmotesEnabled then @@ -13,9 +12,9 @@ if Config.SharedEmotesEnabled then local emotename = string.lower(args[1]) local target, distance = GetClosestPlayer() if (distance ~= -1 and distance < 3) then - if RP.Shared[emotename] ~= nil then - local _, _, ename = table.unpack(RP.Shared[emotename]) - TriggerServerEvent("ServerEmoteRequest", GetPlayerServerId(target), emotename) + if RP[emotename] ~= nil and RP[emotename].category == "Shared" then + local _, _, ename = table.unpack(RP[emotename]) + TriggerServerEvent("rpemotes:server:requestEmote", GetPlayerServerId(target), emotename) SimpleNotify(Translate('sentrequestto') .. GetPlayerName(target) .. " ~w~(~g~" .. ename .. "~w~)") else @@ -30,7 +29,7 @@ if Config.SharedEmotesEnabled then end, false) end -RegisterNetEvent("SyncPlayEmote", function(emote, player) +RegisterNetEvent("rpemotes:client:syncEmote", function(emote, player) EmoteCancel() Wait(300) targetPlayerId = player @@ -40,12 +39,11 @@ RegisterNetEvent("SyncPlayEmote", function(emote, player) return EmoteChatMessage(Translate('not_in_a_vehicle')) end - -- wait a little to make sure animation shows up right on both clients after canceling any previous emote - if RP.Shared[emote] then - local options = RP.Shared[emote].AnimationOptions + if RP[emote] then + local options = RP[emote].AnimationOptions if options and options.Attachto then - local targetEmote = RP.Shared[emote][4] - if not targetEmote or not RP.Shared[targetEmote] or not RP.Shared[targetEmote].AnimationOptions or not RP.Shared[targetEmote].AnimationOptions.Attachto then + local targetEmote = RP[emote][4] + if not targetEmote or not RP[targetEmote] or not RP[targetEmote].AnimationOptions or not RP[targetEmote].AnimationOptions.Attachto then local ped = PlayerPedId() local pedInFront = GetPlayerPed(plyServerId ~= 0 and plyServerId or GetClosestPlayer()) @@ -69,17 +67,14 @@ RegisterNetEvent("SyncPlayEmote", function(emote, player) end end - OnEmotePlay(RP.Shared[emote], emote) - return - elseif RP.Dances[emote] then - OnEmotePlay(RP.Dances[emote], emote) + OnEmotePlay(emote) return else - DebugPrint("SyncPlayEmote : Emote not found") + DebugPrint("rpemotes:client:syncEmote : Emote not found") end end) -RegisterNetEvent("SyncPlayEmoteSource", function(emote, player) +RegisterNetEvent("rpemotes:client:syncEmoteSource", function(emote, player) local ped = PlayerPedId() local plyServerId = GetPlayerFromServerId(player) local pedInFront = GetPlayerPed(plyServerId ~= 0 and plyServerId or GetClosestPlayer()) @@ -88,9 +83,8 @@ RegisterNetEvent("SyncPlayEmoteSource", function(emote, player) return EmoteChatMessage(Translate('not_in_a_vehicle')) end - local options = RP.Shared[emote] and RP.Shared[emote].AnimationOptions or RP.Dances[emote] and RP.Dances[emote].AnimationOptions + local options = RP[emote] and RP[emote].AnimationOptions if options then - if (options.Attachto) then AttachEntityToEntity( ped, @@ -112,24 +106,21 @@ RegisterNetEvent("SyncPlayEmoteSource", function(emote, player) end end - local coords = GetOffsetFromEntityInWorldCoords(pedInFront, (options?.SyncOffsetSide or 0) + 0.0, (options?.SyncOffsetFront or 1) + 0.0, (options?.SyncOffsetHeight or 0) + 0.0) + local coords = GetOffsetFromEntityInWorldCoords(pedInFront, (options and options.SyncOffsetSide or 0) + 0.0, (options and options.SyncOffsetFront or 1) + 0.0, (options and options.SyncOffsetHeight or 0) + 0.0) local heading = GetEntityHeading(pedInFront) - SetEntityHeading(ped, heading - (options?.SyncOffsetHeading or 180) + 0.0) + SetEntityHeading(ped, heading - (options and options.SyncOffsetHeading or 180) + 0.0) SetEntityCoordsNoOffset(ped, coords.x, coords.y, coords.z) EmoteCancel() Wait(300) targetPlayerId = player - if RP.Shared[emote] ~= nil then - OnEmotePlay(RP.Shared[emote], emote) - return - elseif RP.Dances[emote] ~= nil then - OnEmotePlay(RP.Dances[emote], emote) + if RP[emote] ~= nil then + OnEmotePlay(emote) return end end) -RegisterNetEvent("SyncCancelEmote", function(player) +RegisterNetEvent("rpemotes:client:cancelEmote", function(player) if targetPlayerId and targetPlayerId == player then targetPlayerId = nil EmoteCancel() @@ -138,15 +129,15 @@ end) function CancelSharedEmote() if targetPlayerId then - TriggerServerEvent("ServerEmoteCancel", targetPlayerId) + TriggerServerEvent("rpemotes:server:cancelEmote", targetPlayerId) targetPlayerId = nil end end -RegisterNetEvent("ClientEmoteRequestReceive", function(emotename, etype, target) +RegisterNetEvent("rpemotes:client:requestEmote", function(emotename, etype, target) isRequestAnim = true - local displayed = (etype == 'Dances') and select(3, table.unpack(RP.Dances[emotename])) or select(3, table.unpack(RP.Shared[emotename])) + local displayed = RP[emotename] and select(3, table.unpack(RP[emotename])) PlaySound(-1, "NAV", "HUD_AMMO_SHOP_SOUNDSET", false, 0, true) SimpleNotify(Translate('doyouwanna') .. displayed .. "~w~)") @@ -163,8 +154,8 @@ RegisterNetEvent("ClientEmoteRequestReceive", function(emotename, etype, target) if IsControlJustPressed(1, 246) then isRequestAnim = false - local otheremote = RP.Shared[emotename] and RP.Shared[emotename][4] or RP.Dances[emotename] and RP.Dances[emotename][4] or emotename - TriggerServerEvent("ServerValidEmote", target, emotename, otheremote) + local otheremote = RP[emotename] and RP[emotename][4] or emotename + TriggerServerEvent("rpemotes:server:confirmEmote", target, emotename, otheremote) elseif IsControlJustPressed(1, 182) then isRequestAnim = false SimpleNotify(Translate('refuseemote')) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Utils.lua b/resources/[standalone]/rpemotes-reborn/client/Utils.lua similarity index 94% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/Utils.lua rename to resources/[standalone]/rpemotes-reborn/client/Utils.lua index accd6e4f4..365c8bb42 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Utils.lua +++ b/resources/[standalone]/rpemotes-reborn/client/Utils.lua @@ -1,5 +1,3 @@ -LocalPlayer.state:set('canEmote', true, true) -- Allow emotes to be played by default - -- You can edit this function to add support for your favorite notification system function SimpleNotify(message) if Config.NotificationsAsChatMessage then @@ -11,6 +9,16 @@ function SimpleNotify(message) end end +-- Don't touch after this line if you don't know what you're doing +CreateExport = function(name, func) + AddEventHandler('__cfx_export_rpemotes_'..name, function(setCb) + setCb(function(...) + return func(...) + end) + end) + exports(name, func) +end + function DebugPrint(...) if Config.DebugDisplay then print(...) @@ -100,11 +108,10 @@ function LoadAnim(dict) end function LoadPropDict(model) - -- load the model if it's not loaded and wait until it's loaded or timeout - if not HasModelLoaded(joaat(model)) then - RequestModel(joaat(model)) + if not HasModelLoaded(GetHashKey(model)) then + RequestModel(GetHashKey(model)) local timeout = 2000 - while not HasModelLoaded(joaat(model)) and timeout > 0 do + while not HasModelLoaded(GetHashKey(model)) and timeout > 0 do Wait(5) timeout = timeout - 5 end @@ -140,8 +147,10 @@ end function NearbysOnCommand(source, args, raw) local NearbysCommand = "" - for a in PairsByKeys(RP.Shared) do - NearbysCommand = NearbysCommand .. "" .. a .. ", " + for a, b in PairsByKeys(RP) do + if type(b) == "table" and b.category == "Shared" then + NearbysCommand = NearbysCommand .. a .. ", " + end end EmoteChatMessage(NearbysCommand) EmoteChatMessage(Translate('emotemenucmd')) @@ -185,7 +194,7 @@ end ---@param ignores? table | nil key string is the ignored value function IsInActionWithErrorMessage(ignores) - DebugPrint(ignores) + if ignores then DebugPrint(ignores) end DebugPrint('IsProne', IsProne) DebugPrint('IsUsingNewscam', IsUsingNewscam) DebugPrint('IsUsingBinoculars', IsUsingBinoculars) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Walk.lua b/resources/[standalone]/rpemotes-reborn/client/Walk.lua similarity index 72% rename from resources/[standalone]/rpemotes-reborn-1.8.5/client/Walk.lua rename to resources/[standalone]/rpemotes-reborn/client/Walk.lua index 53778aa91..96fe514db 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/client/Walk.lua +++ b/resources/[standalone]/rpemotes-reborn/client/Walk.lua @@ -11,11 +11,17 @@ function WalkMenuStart(name, force) ResetWalk() return end + if not RP[name] or type(RP[name]) ~= "table" or RP[name].category ~= "Walks" then + EmoteChatMessage("'" .. tostring(name) .. "' is not a valid walk") + return + end + + local walk = RP[name][1] + RequestWalking(walk) + SetPedMovementClipset(PlayerPedId(), walk, 0.2) + RemoveAnimSet(walk) if Config.PersistentWalk then SetResourceKvp("walkstyle", name) end - RequestWalking(name) - SetPedMovementClipset(PlayerPedId(), name, 0.2) - RemoveAnimSet(name) end function ResetWalk() @@ -28,8 +34,10 @@ end function WalksOnCommand() local WalksCommand = "" - for a in PairsByKeys(RP.Walks) do - WalksCommand = WalksCommand .. "" .. string.lower(a) .. ", " + for name, data in PairsByKeys(RP) do + if type(data) == "table" and data.category == "Walks" then + WalksCommand = WalksCommand .. string.lower(name) .. ", " + end end EmoteChatMessage(WalksCommand) EmoteChatMessage("To reset do /walk reset") @@ -48,23 +56,21 @@ function WalkCommandStart(name) return end - if TableHasKey(RP.Walks, name) then - local name2 = table.unpack(RP.Walks[name]) - WalkMenuStart(name2) - else - EmoteChatMessage("'" .. name .. "' is not a valid walk") - end + WalkMenuStart(name, true) end --- Persistent Walkstyles are stored to KVP. Once the player has spawned, the walkstyle is applied. - if Config.WalkingStylesEnabled and Config.PersistentWalk then - -- Function to check if walkstyle is available to prevent exploiting local function walkstyleExists(kvp) - for _, v in pairs(RP.Walks) do - if v[1] == kvp then - return true - end + while not CONVERTED do + Wait(0) + end + if not kvp or kvp == "" then + return false + end + + local walkstyle = RP[kvp] + if walkstyle and type(walkstyle) == "table" and walkstyle.category == "Walks" then + return true end return false end @@ -104,15 +110,15 @@ if Config.WalkingStylesEnabled then TriggerEvent('chat:addSuggestion', '/walks', 'List available walking styles.') end -exports('toggleWalkstyle', function(bool, message) +CreateExport('toggleWalkstyle', function(bool, message) canChange = bool if message then unable_message = message end end) -exports('getWalkstyle', function() +CreateExport('getWalkstyle', function() return GetResourceKvpString("walkstyle") end) -exports('setWalkstyle', WalkMenuStart) +CreateExport('setWalkstyle', WalkMenuStart) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/conditionalanims.meta b/resources/[standalone]/rpemotes-reborn/conditionalanims.meta similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/conditionalanims.meta rename to resources/[standalone]/rpemotes-reborn/conditionalanims.meta diff --git a/resources/[standalone]/rpemotes-reborn/config.lua b/resources/[standalone]/rpemotes-reborn/config.lua new file mode 100644 index 000000000..dd359ad19 --- /dev/null +++ b/resources/[standalone]/rpemotes-reborn/config.lua @@ -0,0 +1,164 @@ +-- FOR ALL KEYBINDS, GET THE BUTTON STRING HERE: https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/keyboard/ + +Config = { + MenuLanguage = 'de', -- Change the language of the menu here + + EnableCancelKeybind = true, + CancelEmoteKey = 'X', + + MenuKeybindEnabled = true, + MenuKeybind = 'F4', + + Keybinding = false, + keybindKVP = "rpemotes", + NotificationsAsChatMessage = false, + Search = true, -- Used to enable or disable the search feature in the menu. + CancelPreviousEmote = false, -- If turned on, playing an emote will cancel the previous one. + DisableControlsInMenu = false, + + MenuTitle = '', + TitleOutline = true, + TitleColour = { R = 255, G = 0, B = 255, A = 255 }, + MenuPosition = 'right', -- 'left' / 'right' + CustomMenuEnabled = true, -- Change the header.png to your own image + + -- Combat Car, and Player Movement + DisarmPlayerOnEmote = false, + AllowPunchingDuringEmote = false, + AllowEmoteInVehicle = true, + AllowInWater = false, + + -- Ragdoll + RagdollEnabled = false, + RagdollKeybind = 'U', + + RagdollAsToggle = true, + + -- Expressions, Walks, and More + ExpressionsEnabled = true, + PersistentExpression = true, + + WalkingStylesEnabled = true, + PersistentWalk = true, + SharedEmotesEnabled = true, + AdultEmotesDisabled = false, + AnimalEmotesEnabled = true, + + -- Hands Up + HandsupEnabled = false, + HandsupKeybind = 'Y', + HandsupKeybindEnabled = false, + HandsupInCar = false, + ReplayEmoteAfterHandsup = true, + HoldToHandsUp = false, + + -- Pointing + PointingEnabled = true, + PointingKeybindEnabled = true, + PointingKeybind = 'B', + PointingInCar = false, + ReplayEmoteAfterPointing = true, + + -- Crouching + CrouchEnabled = true, + CrouchKeybindEnabled = true, + CrouchKeybind = 'LCONTROL', + CrouchOverrideStealthMode = false, -- If true, you won't enter stealth mode even if the crouch key and the 'duck' key are the same. + FpsMode = false, -- set this to true if you have first-person shooting to disable the ability to crouch and shoot in third-person + + -- Crawling + CrawlEnabled = true, + CrawlKeybindEnabled = true, + CrawlKeybind = 'RCONTROL', + + -- Binocular (/binoculars) + BinocularsEnabled = false, + AllowVisionsToggling = false, + + -- News Camera (/newscam) + NewscamEnabled = true, + + DisableIdleCam = true, + + -- Preview Ped : Shows a preview of the emote on the player's ped next to the emote menu. Note that resmon will increase when this when emotes are being previewed. + PreviewPed = false, + + CheckForUpdates = true, + DebugDisplay = false, +} + +Config.KeybindKeys = { + 'NUMPAD1', + 'NUMPAD2', + 'NUMPAD3', + 'NUMPAD4', + 'NUMPAD5', + 'NUMPAD6', + 'NUMPAD7', + 'NUMPAD8', + 'NUMPAD9' +} + +Config.DisabledHandsupControls = { + [36] = true, -- INPUT_DUCK + [44] = true, -- INPUT_COVER + [53] = true, -- INPUT_WEAPON_SPECIAL + [54] = true, -- INPUT_WEAPON_SPECIAL_TWO + [59] = true, -- INPUT_VEH_MOVE_LR + [60] = true, -- INPUT_VEH_MOVE_UD + [61] = true, -- INPUT_VEH_MOVE_UP_ONLY + [62] = true, -- INPUT_VEH_MOVE_DOWN_ONLY + [63] = true, -- INPUT_VEH_MOVE_LEFT_ONLY + [64] = true, -- INPUT_VEH_MOVE_RIGHT_ONLY + [65] = true, -- INPUT_VEH_SPECIAL + [66] = true, -- INPUT_VEH_GUN_LR + [67] = true, -- INPUT_VEH_GUN_UD + [69] = true, -- INPUT_VEH_ATTACK + [70] = true, -- INPUT_VEH_ATTACK2 + [71] = true, -- INPUT_VEH_ACCELERATE + [72] = true, -- INPUT_VEH_BRAKE + [73] = true, -- INPUT_VEH_DUCK + [74] = true, -- INPUT_VEH_HEADLIGHT + [77] = true, -- INPUT_VEH_HOTWIRE_LEFT + [78] = true, -- INPUT_VEH_HOTWIRE_RIGHT + [80] = true, -- INPUT_VEH_CIN_CAM + [86] = true, -- INPUT_VEH_HORN + [91] = true, -- INPUT_VEH_PASSENGER_AIM + [102] = true, -- INPUT_VEH_JUMP + [104] = true, -- INPUT_VEH_SHUFFLE + [105] = true, -- INPUT_VEH_DROP_PROJECTILE + [136] = true, -- INPUT_VEH_PUSHBIKE_PEDAL + [137] = true, -- INPUT_VEH_PUSHBIKE_SPRINT + [139] = true, -- INPUT_VEH_PUSHBIKE_REAR_BRAKE + [140] = true, -- INPUT_MELEE_ATTACK_LIGHT + [141] = true, -- INPUT_MELEE_ATTACK_HEAVY + [142] = true, -- INPUT_MELEE_ATTACK_ALTERNATE + [143] = true, -- INPUT_MELEE_BLOCK + [337] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_TOGGLE + [338] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_LEFT + [339] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_RIGHT + [340] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_UP + [341] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_DOWN + [342] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_UD + [343] = true, -- INPUT_VEH_HYDRAULICS_CONTROL_LR + [351] = true, -- INPUT_VEH_ROCKET_BOOST + [354] = true, -- INPUT_VEH_BIKE_WINGS + [357] = true, -- INPUT_VEH_TRANSFORM + [345] = true, -- INPUT_VEH_MELEE_HOLD + [346] = true, -- INPUT_VEH_MELEE_LEFT + [347] = true, -- INPUT_VEH_MELEE_RIGHT +} + +Config.Credits = { + { title = "Thanks to the community", subtitle = "For supporting and using RP Emotes!" }, + { title = "Thanks ~o~DullPear ๐Ÿ~s~", subtitle = "~o~DullPear~s~ for the original dpemotes โค๏ธ" }, + { title = "Thanks Mathu_lmn ๐Ÿ‡ซ๐Ÿ‡ท ", subtitle = "Mathu_lmn ๐Ÿ‡ซ๐Ÿ‡ท Maintainer, additional features and fixes ๐Ÿ› ๏ธ" }, + { title = "Thanks Enzo2991 ๐Ÿ‡ง๐Ÿ‡ช ", subtitle = "Enzo2991 ๐Ÿ‡ง๐Ÿ‡ช for creating the ped preview functionality, keybind with kvp" }, + { title = "Thanks Kibook ๐Ÿฉ", subtitle = "Kibook for the addition of Animal Emotes ๐Ÿฉ submenu." }, + { title = "Thanks ~y~AvaN0x ๐Ÿ‡ซ๐Ÿ‡ท~s~", subtitle = "~y~AvaN0x~s~ ๐Ÿ‡ซ๐Ÿ‡ท for reformatting and assisting with code and additional features ๐Ÿ™" }, + { title = "Thanks iSentrie ", subtitle = "iSentrie for assisting with code ๐Ÿ› ๏ธ" }, + { title = "Thanks Mads ๐Ÿค–", subtitle = "Mads ๐Ÿค– for the addition of Exit Emotes, Crouch & Crawl โš™๏ธ" }, + { title = "Thanks Tigerle ๐Ÿฏ", subtitle = "Tigerle for assisting with attached Shared Emotes โš™๏ธ." }, + { title = "Thanks northsqrd โš™๏ธ", subtitle = "northsqrd for assisting with search feature and phone colours ๐Ÿ”Ž" }, + { title = "Thanks GeekGarage ๐Ÿค“", subtitle = "GeekGarage for assisting with code and features" }, +} diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/fxmanifest.lua b/resources/[standalone]/rpemotes-reborn/fxmanifest.lua similarity index 94% rename from resources/[standalone]/rpemotes-reborn-1.8.5/fxmanifest.lua rename to resources/[standalone]/rpemotes-reborn/fxmanifest.lua index 52d861387..9dedc14a3 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/fxmanifest.lua +++ b/resources/[standalone]/rpemotes-reborn/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'cerulean' game 'gta5' description 'rpemotes-reborn' -version '1.8.5' +version '1.9.0' lua54 'yes' use_experimental_fxv2_oal 'yes' @@ -9,7 +9,6 @@ use_experimental_fxv2_oal 'yes' provide "rpemotes" dependencies { - -- '/server:7290', '/server:6683', '/onesync' } @@ -31,12 +30,12 @@ shared_scripts { server_scripts { 'server/Server.lua', 'server/Updates.lua', - 'server/frameworks/*.lua' } client_scripts { 'NativeUI.lua', 'client/Utils.lua', + 'client/Bridge.lua', 'client/AnimationList.lua', 'client/AnimationListCustom.lua', 'client/Binoculars.lua', @@ -44,14 +43,15 @@ client_scripts { 'client/Emote.lua', 'client/EmoteMenu.lua', 'client/Expressions.lua', + 'client/Handsup.lua', 'client/Keybinds.lua', 'client/NewsCam.lua', 'client/NoIdleCam.lua', 'client/Pointing.lua', + 'client/PTFX.lua', 'client/Ragdoll.lua', 'client/Syncing.lua', 'client/Walk.lua', - 'client/frameworks/*.lua' } diff --git a/resources/[standalone]/rpemotes-reborn/header.png b/resources/[standalone]/rpemotes-reborn/header.png new file mode 100644 index 000000000..2896beec1 Binary files /dev/null and b/resources/[standalone]/rpemotes-reborn/header.png differ diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/license b/resources/[standalone]/rpemotes-reborn/license similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/license rename to resources/[standalone]/rpemotes-reborn/license diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locale.lua b/resources/[standalone]/rpemotes-reborn/locale.lua similarity index 81% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locale.lua rename to resources/[standalone]/rpemotes-reborn/locale.lua index 30f2f5dbb..e6fefffcd 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locale.lua +++ b/resources/[standalone]/rpemotes-reborn/locale.lua @@ -1,9 +1,9 @@ Locales = {} -function Translate(str, ...) -- Translate string +function Translate(str, ...) if not str then print(("[^1ERROR^7] Resource ^5%s^7 You did not specify a parameter for the Translate function or the value is nil!"):format(GetInvokingResource() or GetCurrentResourceName())) - return "Given translate function parameter is nil!" + return "Unknown" end if Locales[Config.MenuLanguage] then if Locales[Config.MenuLanguage][str] then @@ -20,10 +20,9 @@ function Translate(str, ...) -- Translate string end end -function TranslateCap(str, ...) -- Translate string first char uppercase +function TranslateCap(str, ...) return _(str, ...):gsub("^%l", string.upper) end _ = Translate --- luacheck: ignore _U _U = TranslateCap \ No newline at end of file diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/ar.lua b/resources/[standalone]/rpemotes-reborn/locales/ar.lua similarity index 89% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/ar.lua rename to resources/[standalone]/rpemotes-reborn/locales/ar.lua index 9745016f1..b347e5446 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/ar.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/ar.lua @@ -4,12 +4,8 @@ Locales['ar'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ ุญุฑูƒุงุช ุงู„ุฑู‚ุต", ['animalemotes'] = "~h~~p~ ๐Ÿฉ ุญุฑูƒุงุช ุงู„ุญูŠูˆุงู†ุงุช", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ ุญุฑูƒุงุช ุงู„ุงูˆุจุฌูƒุชุงุช", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ ุงู„ู…ูุถู„ุฉ", - ['favoriteinfo'] = "ุงุฎุชุฑ ุญุฑูƒุฉ ู…ู† ู‡ู†ุง ู„ูˆุถุนู‡ุง ุนู„ู‰ ุฎุงู†ุฉ ุงู„ู…ูุถู„ุฉ", - ['rfavorite'] = "ุงุนุงุฏุฉ ุถุจุท ุงู„ู…ูุถู„ุฉ", ['prop2info'] = "โ“ ุญุฑูƒุงุช ุงู„ุงูˆุจุฌูƒุชุงุช ุชูƒูˆู† ู…ุญุฏุฏุฉ ููŠ ุงู„ู†ู‡ุงูŠุฉ", ['set'] = "ูˆุถุน (", - ['setboundemote'] = ") ู„ุชูƒูˆู† ุญุฑูƒุฉ ู…ุฑุจูˆุทุฉ ุŸ", ['newsetemote'] = "~w~ ู‡ูŠ ุญุฑูƒุชูƒ ุงู„ู…ุฑุจูˆุทุฉ , ุงุถุบุท ุนู„ู‰ ~g~CapsLock~w~ ู„ุฅุณุชุฎุฏุงู…ู‡ุง", ['cancelemote'] = "~h~~r~ ุงู„ุบุงุก ุงู„ุญุฑูƒุฉ ๐Ÿšท", ['cancelemoteinfo'] = "ู„ุงู„ุบุงุก ู„ุนุจ ุงู„ุญุฑูƒุฉ ุงู„ุญุงู„ูŠุฉ ~r~X~w~", @@ -54,8 +50,6 @@ Locales['ar'] = { ['searchinputtitle'] = "ุจุญุซ:", ['searchmenudesc'] = " ู†ุชูŠุฌุฉ ู„ู€ ", ['searchnoresult'] = "ู„ุง ูŠูˆุฌุฏ ู†ุชูŠุฌุฉ ู„ู„ุจุญุซ ", - ['searchshifttofav'] = "ุงุถุบุท ุถุบุทุฉ ู…ุทูˆู„ุฉ ุนู„ู‰ L-Shift ู„ูˆุถุนู‡ุง ููŠ ุงู„ู…ูุถู„ุฉ", - ['searchcantsetfav'] = "ุงู„ุญุฑูƒุงุช ุงู„ู…ุดุชุฑูƒุฉ ู„ุง ุชุณุชุทูŠุน ูˆุถุนู‡ุง ููŠ ุงู„ู…ูุถู„ุฉ", ['invalidvariation'] = "ุชูƒุณุชุดุฑ ุบูŠุฑ ุตุงู„ุญ, ุงู„ุงุฎุชูŠุงุฑุงุช ุงู„ุตุญูŠุญุฉ ู‡ูŠ : %s", ['firework'] = "ุงุถุบุท ~y~G~w~ ู„ุงุณุชุฎุฏุงู… ุงู„ุงู„ุนุงุจ ุงู„ู†ุงุฑูŠุฉ", ['poop'] = "ุงุถุบุท ~y~G~w~ ู„ู‚ุถุงุก ุงู„ุญุงุฌุฉ 2", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/cs.lua b/resources/[standalone]/rpemotes-reborn/locales/cs.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/cs.lua rename to resources/[standalone]/rpemotes-reborn/locales/cs.lua index c68e8ee8e..a98700922 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/cs.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/cs.lua @@ -4,12 +4,8 @@ Locales['cs'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Taneฤnรญ Animace", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Zvรญล™ecรญ Animace", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Animace s pล™edmฤ›ty", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Oblรญbenรฉ", - ['favoriteinfo'] = "Vyberte si animaci a nastavte ji jako svou oblรญbenou.", - ['rfavorite'] = "Obnovit oblรญbenรฉ", ['prop2info'] = "โ“ Pomลฏcky se mohou nachรกzet na konci", ['set'] = "Nastavit", - ['setboundemote'] = "Nastavit jako vaลกi animaci?", ['newsetemote'] = "~w~ je nynรญ vaลกรญ novou nastavenou animacรญ. Chcete-li jej pouลพรญt, stisknฤ›te ~g~CapsLock~w~.", ['cancelemote'] = "~h~~r~ Zruลกit animaci ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Zruลกรญ aktuรกlnฤ› pล™ehrรกvanou animaci", @@ -54,8 +50,6 @@ Locales['cs'] = { ['searchinputtitle'] = "Vyhledรกno:", ['searchmenudesc'] = "vรฝsledek pro", ['searchnoresult'] = "ลฝรกdna animace nebyla nalezena", - ['searchshifttofav'] = "Podrลพ L-Shift a stiskni enter pro nastavenรญ animace do oblรญbenรญch.", - ['searchcantsetfav'] = "Sdรญlenรฉ animace nelze nastavit jako oblรญbenรฉ.", ['invalidvariation'] = "Neplatnรก variace textury. Platnรฉ vรฝbฤ›ry jsou: %s", ['firework'] = "Stiskni ~y~G~w~ pro pouลพitรญ ohลˆostroje", ['poop'] = "Stisknutรญm ~y~G~w~ se vykakรกte", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/da.lua b/resources/[standalone]/rpemotes-reborn/locales/da.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/da.lua rename to resources/[standalone]/rpemotes-reborn/locales/da.lua index f48a3784b..3111c5158 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/da.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/da.lua @@ -4,12 +4,8 @@ Locales['da'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Danse Animationer", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Dyr Animationer", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Rekvisit Animationer", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favorit", - ['favoriteinfo'] = "Vรฆlg en animation her for at sรฆtte den som din favorit.", - ['rfavorite'] = "Nulstil Favorit", ['prop2info'] = "โ“ Rekvisit animationer findes i slutningen", ['set'] = "Sรฆt (", - ['setboundemote'] = ") til din favorit animation?", ['newsetemote'] = "~w~ er nu din favorit animation, tryk ~g~CapsLock~w~ for at bruge den.", ['cancelemote'] = "~h~~r~ Afbryd animation", ['cancelemoteinfo'] = "~r~X~w~ annullerer din igangvรฆrende animation.", @@ -54,8 +50,6 @@ Locales['da'] = { ['searchinputtitle'] = "Sรธg:", ['searchmenudesc'] = "resultat(er) for", ['searchnoresult'] = "Ingen resultater fundet med", - ['searchshifttofav'] = "Hold L-Shift og tryk enter for at sรฆtte som favorit.", - ['searchcantsetfav'] = "Delte animationer kan ikke vรฆre favoritter.", ['invalidvariation'] = "Ugyldig teksturvariation. Gyldige valg er: %s", ['firework'] = "Tryk pรฅ ~y~G~w~ for at bruge fyrvรฆrkeri", ['poop'] = "Tryk pรฅ ~y~G~w~ for at skide", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/de.lua b/resources/[standalone]/rpemotes-reborn/locales/de.lua similarity index 92% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/de.lua rename to resources/[standalone]/rpemotes-reborn/locales/de.lua index 027d52d81..83a70acbc 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/de.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/de.lua @@ -4,12 +4,8 @@ Locales['de'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Tanz-Emotes", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Tier Emotes", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Prop-Emotes", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favoriten", - ['favoriteinfo'] = "Wรคhle hier ein Emote, um es als Favorit festzulegen.", - ['rfavorite'] = "Favorit zurรผcksetzen", ['prop2info'] = "โ“ Prop-Emotes kรถnnen am Ende platziert werden", ['set'] = "Setze (", - ['setboundemote'] = ") soll dein gebundenes Emote sein?", ['newsetemote'] = "~w~ ist jetzt ein gebundenes Emote, drรผcke ~g~CapsLock~w~, um es zu verwenden.", ['cancelemote'] = "~h~~r~ Emote abbrechen ๐Ÿšท", ['cancelemoteinfo'] = "~r~ X ~w~ Bricht das aktuell wiedergegebene Emote ab", @@ -63,8 +59,6 @@ Locales['de'] = { ['searchinputtitle'] = "Suche:", ['searchmenudesc'] = "Ergebnis(se) fรผr ", ['searchnoresult'] = "Es wurden keine Ergebnisse gefunden fรผr", - ['searchshifttofav'] = "Halte L-Shift und drรผcke Enter, um das Emote als Favorit festzulegen.", - ['searchcantsetfav'] = "Geteilte Emotes kรถnnen nicht als Favorit gesetzt werden.", ['invalidvariation'] = "Ungรผltige Texturvariante. Gรผltige Auswahlen sind: %s", ['firework'] = "Drรผcke ~y~G~w~, um das Feuerwerk zu zรผnden", ['poop'] = "Drรผcke ~y~G~w~, um zu kacken", @@ -91,7 +85,6 @@ Locales['de'] = { -- Key maps ['register_cancel_emote'] = "Aktuellen Emote abbrechen", ['register_open_menu'] = "Animationsmenรผ รถffnen", - ['register_fav_anim'] = "Deinen Favoriten-Emote abspielen", ['register_handsup'] = "Hรคnde hoch", ['register_crouch'] = "Hocken", ['register_crawl'] = "Kriechen", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/el.lua b/resources/[standalone]/rpemotes-reborn/locales/el.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/el.lua rename to resources/[standalone]/rpemotes-reborn/locales/el.lua index f9d92a6d2..3d224687a 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/el.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/el.lua @@ -4,12 +4,8 @@ Locales['el'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ ฮงฮฟฯฮฟฮฏ", ['animalemotes'] = "~h~~p~ ๐Ÿฉ ฮ–ฯŽฮฑ", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ ฮ‘ฮฝฯ„ฮนฮบฮตฮฏฮผฮตฮฝฮฑ", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ ฮ‘ฮณฮฑฯ€ฮทฮผฮญฮฝฮฑ", - ['favoriteinfo'] = "ฮ”ฮนฮฌฮปฮตฮพฮต ฮบฮฏฮฝฮทฯƒฮท ฮณฮนฮฑ ฮฝฮฑ ฯ„ฮท ฮฒฮฌฮปฮตฮนฯ‚ ฯƒฯ„ฮฑ ฮฑฮณฮฑฯ€ฮทฮผฮญฮฝฮฑ.", - ['rfavorite'] = "ฮ”ฮนฮฑฮณฯฮฑฯ†ฮฎ ฮฑฮณฮฑฯ€ฮทฮผฮญฮฝฯ‰ฮฝ", ['prop2info'] = "โ“ ฮคฮฑ ฮฑฮฝฯ„ฮนฮบฮตฮฏฮผฮตฮฝฮฑ ฮฒฯฮฏฯƒฮบฮฟฮฝฯ„ฮต ฯƒฯ„ฮฟ ฯ„ฮญฮปฮฟฯ‚", ['set'] = "Set (", - ['setboundemote'] = ") ฮฝฮฑ ฯ€ฯฮฟฯƒฯ„ฮตฮธฮตฮฏ ฯƒฯ„ฮฑ ฮฑฮณฮฑฯ€ฮทฮผฮญฮฝฮฑ?", ['newsetemote'] = "~w~ ฮตฮฏฮฝฮฑฮน ฯ„ฯŽฯฮฑ ฯƒฯ„ฮฑ ฮฑฮณฮฑฯ€ฮทฮผฮญฮฝฮฑ ฯƒฮฟฯ…, ฯ€ฮฌฯ„ฮทฯƒฮต ~g~CapsLock~w~ ฮณฮนฮฑ ฮฝฮฑ ฯ„ฮทฮฝ ฯ‡ฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮฎฯƒฮตฮนฯ‚.", ['cancelemote'] = "~h~~r~ ฮ‘ฮบฯฯฯ‰ฯƒฮท ฮšฮฏฮฝฮทฯƒฮทฯ‚ ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ ฮ‘ฮบฯ…ฯฯŽฮฝฮตฮน ฯ„ฮทฮฝ ฮบฮฏฮฝฮทฯƒฮท ฯ€ฮฟฯ… ฮบฮฌฮฝฮตฮนฯ‚ ฯ„ฯŽฯฮฑ", @@ -54,8 +50,6 @@ Locales['el'] = { ['searchinputtitle'] = "ฮ‘ฮฝฮฑฮถฮฎฯ„ฮทฯƒฮท:", ['searchmenudesc'] = "ฮฑฯ€ฮฟฯ„ฮญฮปฮตฯƒฮผฮฑ(ฮฑฯ„ฮฑ) ฮณฮนฮฑ", ['searchnoresult'] = "ฮšฮฑฮฝฮญฮฝฮฑ ฮฑฯ€ฯŒฯ„ฮญฮปฮตฯƒฮผฮฑ ฮณฮนฮฑ ฯ„ฮทฮฝ ฮฑฮฝฮฑฮถฮฎฯ„ฮทฯƒฮท", - ['searchshifttofav'] = "ฮšฯฮฌฯ„ฮทฯƒฮต L-Shift ฮบฮฑฮน ฯ€ฮฌฯ„ฮทฯƒฮต enter ฮณฮนฮฑ ฮฝฮฑ ฯ„ฮฟ ฮฑฯ€ฮฟฮธฮทฮบฮตฯฯƒฮตฮนฯ‚ ฯ‰ฯ‚ ฮฑฮณฮฑฯ€ฮทฮผฮญฮฝฮฟ.", - ['searchcantsetfav'] = "ฮŸฮน ฮบฮนฮฝฮฎฯƒฮตฮนฯ‚ ฯ€ฮฟฯ… ฮผฮฟฮนฯฮฌฮถฮฟฮฝฯ„ฮต ฮผฮต ฯ€ฮฑฮฏฮบฯ„ฮตฯ‚ ฮดฮตฮฝ ฮผฯ€ฮฟฯฮฟฯฮฝ ฮฝฮฑ ฮผฯ€ฮฟฯฮฝ ฯƒฯ„ฮฑ ฮฑฮณฮฑฯ€ฮทฮผฮญฮฝฮฑ.", ['invalidvariation'] = "ฮœฮท ฮญฮณฮบฯ…ฯฮท ฮตฯ€ฮนฮปฮฟฮณฮฎ. ฮฃฯ‰ฯƒฯ„ฮญฯ‚ ฮตฯ€ฮนฮปฮฟฮณฮญฯ‚ ฮตฮฏฮฝฮฑฮน: %s", ['firework'] = "ฮ ฮฌฯ„ฮทฯƒฮต ~y~G~w~ ฮณฮนฮฑ ฮฝฮฑ ฯ‡ฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮฎฯƒฮตฮนฯ‚ ฮฒฮตฮณฮณฮฑฮปฮนฮบฯŒ", ['poop'] = "ฮ ฮฌฯ„ฮทฯƒฮต ~y~G~w~ ฮณฮนฮฑ ฯ‡ฮญฯƒฮนฮผฮฟ", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/en.lua b/resources/[standalone]/rpemotes-reborn/locales/en.lua similarity index 85% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/en.lua rename to resources/[standalone]/rpemotes-reborn/locales/en.lua index 727273218..f722deec8 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/en.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/en.lua @@ -4,12 +4,8 @@ Locales['en'] = { ['danceemotes'] = "๐Ÿ•บ Dance Emotes", ['animalemotes'] = "๐Ÿฉ Animal Emotes", ['propemotes'] = "๐Ÿ“ฆ Prop Emotes", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favorite", - ['favoriteinfo'] = "Select an emote here to set it as your favorite.", - ['rfavorite'] = "Reset favorite", ['prop2info'] = "โ“ Prop Emotes can be located at the end", ['set'] = "Set (", - ['setboundemote'] = ") to be your bound emote?", ['newsetemote'] = "~w~ is now your bound emote, press ~g~CapsLock~w~ to use it.", ['cancelemote'] = "Cancel Emote ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Cancels the currently playing emote", @@ -44,15 +40,16 @@ Locales['en'] = { ['doyouwanna'] = "~y~Y~w~ to accept, ~r~L~w~ to refuse (~g~", ['refuseemote'] = "Emote refused.", ['makenearby'] = "makes the nearby player play", - ['useleafblower'] = "Press ~y~G~w~ to use the leaf blower.", - ['camera'] = "Press ~y~G~w~ to use camera flash.", - ['makeitrain'] = "Press ~y~G~w~ to make it rain.", - ['pee'] = "Hold ~y~G~w~ to pee.", + ['useleafblower'] = "Press ~y~G~w~ to use the leaf blower", + ['camera'] = "Press ~y~G~w~ to use camera flash", + ['makeitrain'] = "Press ~y~G~w~ to make it rain", + ['pee'] = "Hold ~y~G~w~ to pee", ['spraychamp'] = "Hold ~y~G~w~ to spray champagne", - ['stun'] = "Press ~y~G~w~ to 'use' stun gun.", - ['smoke'] = "Press ~y~G~w~ to smoke.", - ['vape'] = "Press ~y~G~w~ to vape.", - ['candle'] = "press ~y~G~w~ to light candle.", + ['stun'] = "Press ~y~G~w~ to 'use' stun gun", + ['smoke'] = "Press ~y~G~w~ to smoke", + ['vape'] = "Press ~y~G~w~ to vape", + ['candle'] = "Press ~y~G~w~ to light candle", + ['ptfxinfo'] = "Press ~y~G~w~ to activate the effects", ['boundto'] = "Bound (~y~%s~w~) to ~g~%s~w~", ['handsup'] = "Hands up", ['currentlyboundemotes'] = "Currently bound emotes:", @@ -63,8 +60,6 @@ Locales['en'] = { ['searchinputtitle'] = "Search:", ['searchmenudesc'] = "result(s) for", ['searchnoresult'] = "No results for search", - ['searchshifttofav'] = "Hold L-Shift and press enter to set as favorite.", - ['searchcantsetfav'] = "Shared emotes cannot be set as favorites.", ['invalidvariation'] = "Invalid texture variation. Valid selections are: %s", ['firework'] = "Press ~y~G~w~ to use the firework", ['poop'] = "Press ~y~G~w~ to poop", @@ -91,7 +86,6 @@ Locales['en'] = { -- Key maps ['register_cancel_emote'] = "Cancel current emote", ['register_open_menu'] = "Open animation menu", - ['register_fav_anim'] = "Play your favorite emote", ['register_handsup'] = "Raise hands up", ['register_crouch'] = "Crouch", ['register_crawl'] = "Crawl", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/es.lua b/resources/[standalone]/rpemotes-reborn/locales/es.lua similarity index 90% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/es.lua rename to resources/[standalone]/rpemotes-reborn/locales/es.lua index 4afaee579..aba0dad69 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/es.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/es.lua @@ -4,12 +4,8 @@ Locales['es'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Bailes", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Emotes de animales", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Objetos", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favoritos", - ['favoriteinfo'] = "Seleccione una animaciรณn aquรญ para configurarlo como su favorito.", - ['rfavorite'] = "Restablecer favoritos", ['prop2info'] = "โ“ Los Prop Emotes se pueden encontrar al final", ['set'] = "Elegir (", - ['setboundemote'] = ") como tu animaciรณn favorita?", ['newsetemote'] = "~w~ es ahora tu animaciรณn favorita, presiona ~g~[CapsLock]~w~ para usarla.", ['cancelemote'] = "~h~~r~ Cancelar animaciรณn ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Cancela la animaciรณn actual.", @@ -53,8 +49,6 @@ Locales['es'] = { ['searchinputtitle'] = "Buscar:", ['searchmenudesc'] = "resultado(s) para", ['searchnoresult'] = "No se encontrรณ nada con", - ['searchshifttofav'] = "Mantรฉn L-Shift y presiona Enter para guardar como favorito.", - ['searchcantsetfav'] = "Las animaciones compartidas no pueden ser guardadas como favoritas.", ['invalidvariation'] = "Variaciรณn de textura no vรกlida. Las opciones vรกlidas son: %s", ['firework'] = "Presione ~y~G~w~ para usar los fuegos artificiales", ['poop'] = "Presione ~y~G~w~ para hacer caca", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/fa.lua b/resources/[standalone]/rpemotes-reborn/locales/fa.lua similarity index 90% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/fa.lua rename to resources/[standalone]/rpemotes-reborn/locales/fa.lua index 673b394f1..d87314dd8 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/fa.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/fa.lua @@ -4,12 +4,8 @@ Locales['fa'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ raghs Emotes", ['animalemotes'] = "~h~~p~ ๐Ÿฉ hevanat Emotes", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ tekye dadan Emotes", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ alaghemandiha", - ['favoriteinfo'] = "yek emote ra baray ezafe kardan be alaghe mandi ha entekhab konid.", - ['rfavorite'] = "bazneshani alaghe mandi ha", ['prop2info'] = "โ“ bad az tekye dadan be yek ja motavaghef mishavad", ['set'] = "Set (", - ['setboundemote'] = ") che kelid baray dastressi sari entekhab shavad?", ['newsetemote'] = "~w~ baray dastresi sari, press ~g~CapsLock~w~ baray ejra", ['cancelemote'] = "~h~~r~ laghv emote๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ baray laghv emote ", @@ -54,8 +50,6 @@ Locales['fa'] = { ['searchinputtitle'] = "jostojo:", ['searchmenudesc'] = "result(s) for", ['searchnoresult'] = "No results for search", - ['searchshifttofav'] = "Hold L-Shift and press enter to set as favorite.", - ['searchcantsetfav'] = "Shared emotes cannot be set as favorites.", ['invalidvariation'] = "Invalid texture variation. Valid selections are: %s", ['firework'] = "Press ~y~G~w~ to use the firework", ['poop'] = "Press ~y~G~w~ to poop", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/fi.lua b/resources/[standalone]/rpemotes-reborn/locales/fi.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/fi.lua rename to resources/[standalone]/rpemotes-reborn/locales/fi.lua index 232a4058a..478a17a5e 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/fi.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/fi.lua @@ -4,12 +4,8 @@ Locales['fi'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Tanssi Animaatiot", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Elรคin Animaatiot", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Esine Animaatiot", - ['favoriteemotes'] = "~h~~p~ ๐ŸŒŸ Suosikit", - ['favoriteinfo'] = "Valitse animaatio asettaaksesi sen suosikiksi.", - ['rfavorite'] = "Resetoi suosikit.", ['prop2info'] = "โ“ Esine animaatiot voivat sijaita lopussa", ['set'] = "Aseta (", - ['setboundemote'] = ") bindatuksi animaatioksi?", ['newsetemote'] = "~w~ on nyt bindattu animaatio, paina ~g~CapsLock~w~ kรคyttรครคksesi", ['cancelemote'] = "~h~~r~ Peru animaatio ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Peruu tรคmรคn hetkisen animaation", @@ -54,8 +50,6 @@ Locales['fi'] = { ['searchinputtitle'] = "Etsi:", ['searchmenudesc'] = "tulokset", ['searchnoresult'] = "Ei tuloksia haulle", - ['searchshifttofav'] = "Pidรค L-Shift painettuna ja aseta suosikiksi painamalla Enter.", - ['searchcantsetfav'] = "Jaettuja emoteja ei voi asettaa suosikeiksi.", ['invalidvariation'] = "Virheellinen tekstuurimuunnelma. Kelvollisia valintoja ovat: %s", ['firework'] = "Kรคytรค ilotulitteita painamalla ~y~G~w~", ['poop'] = "Paina ~y~G~w~ kakataksesi.", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/fr.lua b/resources/[standalone]/rpemotes-reborn/locales/fr.lua similarity index 92% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/fr.lua rename to resources/[standalone]/rpemotes-reborn/locales/fr.lua index b50876957..2d15778f1 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/fr.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/fr.lua @@ -4,12 +4,8 @@ Locales['fr'] = { ['danceemotes'] = "~p~ ๐Ÿ•บ Danses", ['animalemotes'] = "~p~ ๐Ÿฉ Emotes d'animaux", ['propemotes'] = "~p~ ๐Ÿ“ฆ Emotes objet", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favori", - ['favoriteinfo'] = "Dรฉfinir une emote comme favori.", - ['rfavorite'] = "Rรฉinitialiser le favori.", ['prop2info'] = "โ“ Les emotes d'objet peuvent รชtre ร  la fin", ['set'] = "Mettre (", - ['setboundemote'] = ") en emote favorite?", ['newsetemote'] = "~w~ est maintenant votre emote favorite, appuyez sur ~g~CapsLock~w~ pour l'utiliser.", ['cancelemote'] = "~r~ Annuler l'รฉmote ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Annule l'emote en cours", @@ -53,8 +49,6 @@ Locales['fr'] = { ['searchinputtitle'] = "Recherche:", ['searchmenudesc'] = "resultat(s) pour", ['searchnoresult'] = "Aucun rรฉsultat pour la recherche : ", - ['searchshifttofav'] = "Maintenir L-Shift et appuyer sur entrer pour marquer comme favorie.", - ['searchcantsetfav'] = "Les emotes partagรฉes ne peuvent pas รชtre mise en favorie.", ['invalidvariation'] = "Variation de texture invalide. Les sรฉlections valides sont : %s", ['firework'] = "Appuyez sur G pour utiliser les feux d'artifice", ['poop'] = "Appuyez sur G pour faire caca.", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/hu.lua b/resources/[standalone]/rpemotes-reborn/locales/hu.lua similarity index 90% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/hu.lua rename to resources/[standalone]/rpemotes-reborn/locales/hu.lua index c6f7f8391..be0b4ec6a 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/hu.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/hu.lua @@ -4,12 +4,8 @@ Locales['hu'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Tรกnc Animรกciรณk", ['animalemotes'] = "~h~~p~ ๐Ÿฉ รllatos Animรกciรณk", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Tรกrgyas Animรกciรณk", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Kedvenc", - ['favoriteinfo'] = "Vรกlassz ki itt egy animรกciรณt, hogy kedvenceddรฉ tedd.", - ['rfavorite'] = "Kedvenc alaphelyzetbe รกllรญtรกsa", ['prop2info'] = "โ“ A Prop Emote-ok a vรฉgรฉn talรกlhatรณk", ['set'] = "Kivรกlasztod (", - ['setboundemote'] = ") hogy ez legyen a kedvenc animรกciรณd?", ['newsetemote'] = "~w~ lett a kedvenc animรกciรณd, nyomj egy ~g~CapsLock~w~-ot a hasznรกlatรกhoz.", ['cancelemote'] = "~h~~r~ Animรกciรณ Befejezรฉse ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Megszรผnteti az aktuรกlisan lejรกtszott animรกciรณt", @@ -54,8 +50,6 @@ Locales['hu'] = { ['searchinputtitle'] = "Keresรฉs:", ['searchmenudesc'] = "eredmรฉny erre: ", ['searchnoresult'] = "Nincs eredmรฉny erre:", - ['searchshifttofav'] = "Tartsd lenyomva az L-Shift billentyลฑt, รฉs nyomd meg az enter billentyลฑt a kedvencek beรกllรญtรกsรกhoz.", - ['searchcantsetfav'] = "A megosztott animรกciรณkat nem lehet kedvencekkรฉnt beรกllรญtani.", ['invalidvariation'] = "ร‰rvรฉnytelen textรบra variรกciรณ. ร‰rvรฉnyes vรกlasztรกsok a kรถvetkezล‘k: %s", ['firework'] = "Nyomj ~y~G~w~ gombot a tลฑzijรกtรฉk hasznรกlatรกhoz", ['poop'] = "Nyomj ~y~G~w~ gombot a kakilรกshoz", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/id.lua b/resources/[standalone]/rpemotes-reborn/locales/id.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/id.lua rename to resources/[standalone]/rpemotes-reborn/locales/id.lua index a37dbcf37..74c0a101d 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/id.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/id.lua @@ -4,12 +4,8 @@ Locales['id'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Emote Menari", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Emote Hewan", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Prop Emotes", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favorit", - ['favoriteinfo'] = "Pilih emote di sini untuk menetapkannya sebagai favorit Anda.", - ['rfavorite'] = "Setel ulang favorit", ['prop2info'] = "โ“ Prop Emotes can be located at the end", ['set'] = "Tetapkan (", - ['setboundemote'] = ") untuk menjadi emote terikat Anda?", ['newsetemote'] = "~w~ sekarang menjadi emote terikat Anda, tekan ~g~CapsLock~w~ untuk menggunakannya.", ['cancelemote'] = "~h~~r~ Batalkan Emote ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Batalkan emote yang sedang dimainkan", @@ -54,8 +50,6 @@ Locales['id'] = { ['searchinputtitle'] = "Cari:", ['searchmenudesc'] = "hasil untuk", ['searchnoresult'] = "Tidak ada hasil untuk pencarian", - ['searchshifttofav'] = "Tahan L-Shift dan tekan enter untuk menetapkan sebagai favorit.", - ['searchcantsetfav'] = "Emote yang dibagikan tidak dapat ditetapkan sebagai favorit.", ['invalidvariation'] = "Variasi tekstur tidak valid. Pilihan yang valid adalah: %s", ['firework'] = "Tekan ~y~G~w~ untuk menggunakan kembang api", ['poop'] = "Tekan ~y~G~w~ untuk buang air besar", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/it.lua b/resources/[standalone]/rpemotes-reborn/locales/it.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/it.lua rename to resources/[standalone]/rpemotes-reborn/locales/it.lua index 15ea6c39d..0a410f5cc 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/it.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/it.lua @@ -4,12 +4,8 @@ Locales['it'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Animazioni Di Danza", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Animazioni Di Animali", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Animazioni Prop", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Emote preferite", - ['favoriteinfo'] = "Seleziona un'animazione per metterla nei preferiti.", - ['rfavorite'] = "Rimuovi preferito", ['prop2info'] = "โ“ Le animazioni Prop possono essere trovate in fondo.", ['set'] = "Imposta (", - ['setboundemote'] = ") come tua animazione corrente?", ['newsetemote'] = "~w~ รจ ora la tua animazione corrente, premi ~g~CapsLock~w~ per usarla.", ['cancelemote'] = "~h~~r~ Annulla animazione ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Cancella l'animazione in corso.", @@ -54,8 +50,6 @@ Locales['it'] = { ['searchinputtitle'] = "Search:", ['searchmenudesc'] = "result(s) for", ['searchnoresult'] = "No results for search", - ['searchshifttofav'] = "Hold L-Shift and press enter to set as favorite.", - ['searchcantsetfav'] = "Shared emotes cannot be set as favorites.", ['invalidvariation'] = "Opzioni colore non valide. scelte valide sono: %s", ['firework'] = "Premere ~y~G~w~ per utilizzare il fuoco d'artificio", ['poop'] = "Premere ~y~G w~ per fare la cacca", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/lk.lua b/resources/[standalone]/rpemotes-reborn/locales/lk.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/lk.lua rename to resources/[standalone]/rpemotes-reborn/locales/lk.lua index 6f12ffdfb..541ff953d 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/lk.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/lk.lua @@ -4,12 +4,8 @@ Locales['lk'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Natana Emotes", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Sattunge Emotes", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Prop Emotes", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favorite Emotes", - ['favoriteinfo'] = "Methanin oyage favorite emote eka thoraganna.", - ['rfavorite'] = "Favorite emote eka reset karanna", ['prop2info'] = "โ“ Prop emotes tiyenne anthimata", ['set'] = "Set karanna (", - ['setboundemote'] = ") favorite emote eka widiyata?", ['newsetemote'] = "~w~ thamai oyage favorite emote eka, ~g~CapsLock~w~ eken use karanna.", ['cancelemote'] = "~h~~r~ Emote Eka Nawattanna ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Wetila thiyana emote eka nawattanawa", @@ -54,8 +50,6 @@ Locales['lk'] = { ['searchinputtitle'] = "Search karanna:", ['searchmenudesc'] = "result(s) for", ['searchnoresult'] = "Mukut hambune na", - ['searchshifttofav'] = "L-Shift obagena Enter press karala, favorite karaganna.", - ['searchcantsetfav'] = "Shared emotes favorite karanna ba.", ['invalidvariation'] = "Weradi texture variation ekak. Hari ewa thamai: %s", ['firework'] = "Firework ekata ~y~G~w~ press karanna", ['poop'] = "Kakki danna ~y~G~w~ press karanna", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/lt.lua b/resources/[standalone]/rpemotes-reborn/locales/lt.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/lt.lua rename to resources/[standalone]/rpemotes-reborn/locales/lt.lua index aaf1e0415..149dbfa5b 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/lt.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/lt.lua @@ -4,12 +4,8 @@ Locales['lt'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Sokiu animacijos", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Gyvunu animacijos", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Daiktu animacijos", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Megstamiausi", - ['favoriteinfo'] = "Cia pasirinkite jaustuka, kad nustatytumete ji kaip megstamiausia.", - ['rfavorite'] = "Atstatyti megstamiausia", ['prop2info'] = "โ“ Daiktu animacijos gali buti pabaigoje", ['set'] = "Rinkinys (", - ['setboundemote'] = ") buti tavo surista emocija?", ['newsetemote'] = "~w~ dabar yra jusu susietas jaustukas, paspauskite ~g~CapsLock~w~, kad ji naudotumete.", ['cancelemote'] = "~h~~r~ Atsaukti animacija ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Atsaukti dabar naudojama animacija", @@ -63,8 +59,6 @@ Locales['lt'] = { ['searchinputtitle'] = "Ieskoti:", ['searchmenudesc'] = "rezultatas (-ai), skirtas", ['searchnoresult'] = "Paieskos rezultatu nera", - ['searchshifttofav'] = "Laikykite nuspaude L-Shift ir paspauskite Enter, kad nustatytumete kaip megstamiausia.", - ['searchcantsetfav'] = "Bendrinamos animacijos negali buti nustatytos kaip megstamiausios.", ['invalidvariation'] = "Netinkamas teksturos variantas. Galiojantys pasirinkimai yra: %s", ['firework'] = "Paspauskite ~y~G~w~, kad galetumete naudoti fejerverka", ['poop'] = "Paspauskite ~y~G~w~, kad istustumete", @@ -93,7 +87,6 @@ Locales['lt'] = { ['register_cancel_emote'] = "Atลกaukti animacijฤ…", ['register_handsup'] = "Pakelti rankas", ['register_open_menu'] = "Animacijลณ meniu", - ['register_fav_anim'] = "Paleisti mฤ—gstamiausia animacijฤ…", ['register_crouch'] = "Pritลซpti", ['register_crawl'] = "ล liauลพti", ['register_pointing'] = "Rodyti pirลกtu", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/nl.lua b/resources/[standalone]/rpemotes-reborn/locales/nl.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/nl.lua rename to resources/[standalone]/rpemotes-reborn/locales/nl.lua index 84357493e..f9a264523 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/nl.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/nl.lua @@ -4,12 +4,8 @@ Locales['nl'] = { ['danceemotes'] = "๐Ÿ•บ Dans Animaties", ['animalemotes'] = "๐Ÿฉ Dier Animaties", ['propemotes'] = "๐Ÿ“ฆ Voorwerp Animaties", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favoriete", - ['favoriteinfo'] = "Selecteer hier een animatie om deze als favoriete in te stellen.", - ['rfavorite'] = "Favoriete wissen", ['prop2info'] = "โ“ Voorwerp animaties aan het einde", ['set'] = "Maak (", - ['setboundemote'] = ") je toegewezen animatie.", ['newsetemote'] = "~w~ is nu je toegewezen animatie, druk op ~g~CapsLock~w~ om het te gebruiken.", ['cancelemote'] = "Animatie Stoppen ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Stopt je huidige animatie.", @@ -63,8 +59,6 @@ Locales['nl'] = { ['searchinputtitle'] = "Zoeken:", ['searchmenudesc'] = "resultaten voor", ['searchnoresult'] = "Geen resultaten voor zoekopdracht", - ['searchshifttofav'] = "Houd ~y~L-Shift~w~ ingedrukt en druk op enter om als favoriet op te slaan.", - ['searchcantsetfav'] = "Gedeelde animaties kunnen niet als favoriet worden ingesteld", ['invalidvariation'] = "Ongeldige texture variatie. Geldige selecties zijn: %s", ['firework'] = "Druk op ~y~G~w~ om het vuurwerk te gebruiken", ['poop'] = "Druk op ~y~G~w~ om te poepen", @@ -91,7 +85,6 @@ Locales['nl'] = { -- Key maps ['register_cancel_emote'] = "Huidige animatie stoppen", ['register_open_menu'] = "Animatiemenu openen", - ['register_fav_anim'] = "Start je favoriete animatie", ['register_handsup'] = "Handen omhoog", ['register_crouch'] = "Hurken", ['register_crawl'] = "Kruipen", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/no.lua b/resources/[standalone]/rpemotes-reborn/locales/no.lua similarity index 92% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/no.lua rename to resources/[standalone]/rpemotes-reborn/locales/no.lua index af3403db2..81ac87273 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/no.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/no.lua @@ -4,12 +4,8 @@ Locales['no'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Danse Animasjoner", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Dyreanimasjoner", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Rekvisitt Animasjoner", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favoritt", - ['favoriteinfo'] = "Her kan du velge en favoritt animasjon.", - ['rfavorite'] = "Reset favoritt", ['prop2info'] = "โ“ Rekvisitt Animasjoner er pรฅ bunnen", ['set'] = "Vil du sette (", - ['setboundemote'] = ") som din favoritt?", ['newsetemote'] = "~w~ er nรฅ lagret som din favoritt, trykk ~g~CapsLock~w~ for รฅ bruke den.", ['cancelemote'] = "~h~~r~ Avbryt Animasjonen ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Avbryt den nรฅvรฆrende animasjonen", @@ -54,8 +50,6 @@ Locales['no'] = { ['searchinputtitle'] = "Sรธk:", ['searchmenudesc'] = "resultat(er) for", ['searchnoresult'] = "Ingen resultater for sรธk", - ['searchshifttofav'] = "Hold L-Shift og trykk Enter for รฅ sette som favoritt.", - ['searchcantsetfav'] = "Du kan ikke sitte en Felles Animasjon som favoritt.", ['invalidvariation'] = "Ugyldig tekstur variant. Gyldige varianter: %s", ['firework'] = "Trykk ~y~G~w~ for รฅ avfyre fyrverkeriet", ['poop'] = "Hold ~y~G~w~ for รฅ bรฆsje", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/pl.lua b/resources/[standalone]/rpemotes-reborn/locales/pl.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/pl.lua rename to resources/[standalone]/rpemotes-reborn/locales/pl.lua index 88282e4f9..abbda246a 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/pl.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/pl.lua @@ -4,12 +4,8 @@ Locales['pl'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Taล„ce", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Animacje zwierzฤ…t", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Animacje z propami", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Ulubione", - ['favoriteinfo'] = "Wybierz animacjฤ™ i ustaw jฤ… jako ulubionฤ….", - ['rfavorite'] = "Zresetuj ulubione animacje", ['prop2info'] = "โ“ Animacje z propami sฤ… zlokalizowane na samym koล„cu listy", ['set'] = "Ustaw (", - ['setboundemote'] = ") jako Twojฤ… przypisanฤ… animacjฤ™?", ['newsetemote'] = "~w~ jest teraz Twojฤ… przypisanฤ… animacjฤ…, wciล›nij ~g~CapsLock~w~ by jej uลผyฤ‡.", ['cancelemote'] = "~h~~r~ Anuluj animacjฤ™ ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Anuluje aktualnie granฤ… animacjฤ™", @@ -54,8 +50,6 @@ Locales['pl'] = { ['searchinputtitle'] = "Szukaj:", ['searchmenudesc'] = "wynikรณw dla frazy", ['searchnoresult'] = "Brak wynikรณw dla frazy", - ['searchshifttofav'] = "Przytrzymaj L-Shift i naciล›nij Enter by dodaฤ‡ do ulubionych.", - ['searchcantsetfav'] = "Wspรณล‚dzielona animacja nie moลผe byฤ‡ dodana do ulubionych.", ['invalidvariation'] = "Niepoprawny wariant tekstury. Dostฤ™pne tekstury to: %s", ['firework'] = "Naciล›nij ~y~G~w~ aby odpaliฤ‡ fajerwerki", ['poop'] = "Naciล›nij ~y~G~w~ by zrobiฤ‡ kupฤ™", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/pt.lua b/resources/[standalone]/rpemotes-reborn/locales/pt.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/pt.lua rename to resources/[standalone]/rpemotes-reborn/locales/pt.lua index 1cee20a18..2b0a63adb 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/pt.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/pt.lua @@ -4,12 +4,8 @@ Locales['pt'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Emotes de Danรงas", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Emotes de Animais", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Emotes com Props", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favoritos", - ['favoriteinfo'] = "Selecione um emote para colocรก-lo nos seus favoritos", - ['rfavorite'] = "Limpar favoritos", ['prop2info'] = "โ“ Emotes de props podem ser localizados no fim", ['set'] = "Set (", - ['setboundemote'] = ") para ser seu emote vinculado?", ['newsetemote'] = "~w~ รฉ o seu emote vinculado, pressione ~g~CapsLock~w~ para usรก-lo", ['cancelemote'] = "~h~~r~ Cancelar emote ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Cancela os emotes rodando atualmente", @@ -54,8 +50,6 @@ Locales['pt'] = { ['searchinputtitle'] = "Procurar:", ['searchmenudesc'] = "resultado(s) para", ['searchnoresult'] = "Nenhum resultado para a pesquisa", - ['searchshifttofav'] = "Segure Shift Esquerdo e pressione enter para setar como favorito.", - ['searchcantsetfav'] = "Emotes compartilhados nรฃo podem ser setados como favorito.", ['invalidvariation'] = "Variaรงรฃo de textura invรกlida. As opรงรตes vรกlidas sรฃo: %s", ['firework'] = "Pressione ~y~G~w~ para usar o fogo de artifรญcio", ['poop'] = "Pressione ~y~G~w~ para fazer cocรด", -- Translated using smodin.io diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/ro.lua b/resources/[standalone]/rpemotes-reborn/locales/ro.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/ro.lua rename to resources/[standalone]/rpemotes-reborn/locales/ro.lua index 34270e5bc..c160b8548 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/ro.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/ro.lua @@ -4,12 +4,8 @@ Locales['ro'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Dansuri", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Emote-uri pentru animale", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Prop Emote-uri", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favorite", - ['favoriteinfo'] = "Selecteaza un emote aici pentru a รฎl alege ca favorit.", - ['rfavorite'] = "Reseteaza emote-uri favorite", ['prop2info'] = "โ“ Prop Emote-urile pot fi gasite la final", ['set'] = "Seteaza (", - ['setboundemote'] = ") sa fie emote-ul binduit?", ['newsetemote'] = "~w~ este acum emote-ul tau binduit, apasa ~g~CapsLock~w~ pentru a folosi.", ['cancelemote'] = "~h~~r~ Anuleaza animatia ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Anuleaza animatia curenta", @@ -54,8 +50,6 @@ Locales['ro'] = { ['searchinputtitle'] = "Cautare:", ['searchmenudesc'] = "rezultat(e) pentru", ['searchnoresult'] = "Fara rezultate pentru cautarea", - ['searchshifttofav'] = "Tine apasat L-Shift si apasa enter pentru a seta ca favorit.", - ['searchcantsetfav'] = "Emote-urile Shared nu pot fi setate ca favorite.", ['invalidvariation'] = "Variaศ›ie nevalidฤƒ a texturii. Selectฤƒrile valide sunt: โ€‹โ€‹%s", ['firework'] = "Apasa ~y~G~w~ pentru a folosi artificiile", ['poop'] = "Apฤƒsaศ›i pe ~y~G~w~ pentru a face caca", --Trannslated using smodin.io diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/ru.lua b/resources/[standalone]/rpemotes-reborn/locales/ru.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/ru.lua rename to resources/[standalone]/rpemotes-reborn/locales/ru.lua index 46983031c..2193196c1 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/ru.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/ru.lua @@ -4,12 +4,8 @@ Locales['ru'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ ะขะฐะฝั†ะตะฒะฐะปัŒะฝั‹ะต ัะผะพั†ะธะธ", ['animalemotes'] = "~h~~p~ ๐Ÿฉ ะญะผะพั†ะธะธ ะถะธะฒะพั‚ะฝั‹ั…", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ ะญะผะพั†ะธะธ ั ะฟั€ะพะฟะพะผ", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ ะ˜ะทะฑั€ะฐะฝะฝั‹ะต", - ['favoriteinfo'] = "ะ’ั‹ะฑะตั€ะธั‚ะต ะทะดะตััŒ ัะผะพั†ะธัŽ, ั‡ั‚ะพะฑั‹ ัะดะตะปะฐั‚ัŒ ะตะต ะธะทะฑั€ะฐะฝะฝะพะน.", - ['rfavorite'] = "ะกะฑั€ะพัะธั‚ัŒ ะธะทะฑั€ะฐะฝะฝะพะต", ['prop2info'] = "โ“ ะญะผะพั†ะธะธ ั ะฟั€ะพะฟะพะผ ะผะพะณัƒั‚ ะฑั‹ั‚ัŒ ั€ะฐัะฟะพะปะพะถะตะฝั‹ ะฒ ะบะพะฝั†ะต", ['set'] = "ะฃัั‚ะฐะฝะพะฒะธั‚ัŒ (", - ['setboundemote'] = ") ะบะฐะบ ะฟั€ะธะฒัะทะฐะฝะฝัƒัŽ ัะผะพั†ะธัŽ?", ['newsetemote'] = "~w~ ั‚ะตะฟะตั€ัŒ ะฟั€ะธะฒัะทะฐะฝะฝะฐั ัะผะพั†ะธั, ะฝะฐะถะผะธั‚ะต ~g~CapsLock~w~ ะดะปั ะธัะฟะพะปัŒะทะพะฒะฐะฝะธั.", ['cancelemote'] = "~h~~r~ ะžัั‚ะฐะฝะพะฒะธั‚ัŒ ัะผะพั†ะธัŽ ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ ะžั‚ะผะตะฝัะตั‚ ะฒะพัะฟั€ะพะธะทะฒะพะดะธะผัƒัŽ ัะผะพั†ะธัŽ", @@ -62,8 +58,6 @@ Locales['ru'] = { ['searchinputtitle'] = "ะŸะพะธัะบ:", ['searchmenudesc'] = "ั€ะตะทัƒะปัŒั‚ะฐั‚(ั‹) ะดะปั", ['searchnoresult'] = "ะะตั‚ ั€ะตะทัƒะปัŒั‚ะฐั‚ะพะฒ ะฟะพ ะฟะพะธัะบัƒ", - ['searchshifttofav'] = "ะฃะดะตั€ะถะธะฒะฐะนั‚ะต L-Shift ะธ ะฝะฐะถะผะธั‚ะต Enter, ั‡ั‚ะพะฑั‹ ัƒัั‚ะฐะฝะพะฒะธั‚ัŒ ะฒ ะธะทะฑั€ะฐะฝะฝะพะต.", - ['searchcantsetfav'] = "ะŸะฐั€ะฝั‹ะต ัะผะพั†ะธะธ ะฝะต ะผะพะณัƒั‚ ะฑั‹ั‚ัŒ ะดะพะฑะฐะฒะปะตะฝั‹ ะฒ ะธะทะฑั€ะฐะฝะฝะพะต.", ['invalidvariation'] = "ะะตะดะพะฟัƒัั‚ะธะผะฐั ะฒะฐั€ะธะฐั†ะธั ั‚ะตะบัั‚ัƒั€ั‹. ะ”ะพะฟัƒัั‚ะธะผั‹ะต ะฒะฐั€ะธะฐะฝั‚ั‹: %s", ['firework'] = "ะะฐะถะผะธั‚ะต ~y~G~w~, ั‡ั‚ะพะฑั‹ ะทะฐะฟัƒัั‚ะธั‚ัŒ ั„ะตะนะตั€ะฒะตั€ะบ.", ['poop'] = "ะะฐะถะผะธั‚ะต ~y~G~w~, ั‡ั‚ะพะฑั‹ ะบะฐะบะฐั‚ัŒ", @@ -91,7 +85,6 @@ Locales['ru'] = { -- Key maps ['register_cancel_emote'] = "ะžั‚ะผะตะฝะธั‚ัŒ ั‚ะตะบัƒั‰ัƒัŽ ัะผะพั†ะธัŽ", ['register_open_menu'] = "ะžั‚ะบั€ั‹ั‚ัŒ ะผะตะฝัŽ ะฐะฝะธะผะฐั†ะธะธ", - ['register_fav_anim'] = "ะ’ะพัะฟั€ะพะธะทะฒะตะดะธั‚ะต ัะฒะพัŽ ะปัŽะฑะธะผัƒัŽ ัะผะพั†ะธัŽ", ['register_handsup'] = "ะŸะพะดะฝะธะผะธั‚ะต ั€ัƒะบะธ ะฒะฒะตั€ั…", ['register_crouch'] = "ะ’ ะฟั€ะธัะตะดะธ", ['register_crawl'] = "ะŸะพะปะทั‚ะธ", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/sl.lua b/resources/[standalone]/rpemotes-reborn/locales/sl.lua similarity index 90% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/sl.lua rename to resources/[standalone]/rpemotes-reborn/locales/sl.lua index f9ed6cab0..09e4dd8f0 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/sl.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/sl.lua @@ -4,12 +4,8 @@ Locales['sl'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Plesi", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Emote ลพivali", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Emote pripomoฤkov", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Priljubljeni", - ['favoriteinfo'] = "Izberite emote tukaj, da ga nastavite kot priljubljenega.", - ['rfavorite'] = "Ponastavi priljubljenega", ['prop2info'] = "โ“ Emote pripomoฤki se nahajajo na koncu", ['set'] = "Nastavi (", - ['setboundemote'] = ") kot vaลก vezan emote?", ['newsetemote'] = "~w~ je sedaj vaลก vezan emote, pritisnite ~g~CapsLock~w~, da ga uporabite.", ['cancelemote'] = "~h~~r~ Prekliฤi Emote ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Prekliฤe trenutno predvajani emote", @@ -54,8 +50,6 @@ Locales['sl'] = { ['searchinputtitle'] = "Iskanje:", ['searchmenudesc'] = "rezultat(ov) za", ['searchnoresult'] = "Ni rezultatov za iskanje", - ['searchshifttofav'] = "Pritisnite in pridrลพite levi Shift ter pritisnite Enter, da ga nastavite kot priljubljenega.", - ['searchcantsetfav'] = "Deljeni emotes ni mogoฤe nastaviti kot priljubljene.", ['invalidvariation'] = "Neveljavna teksturna variacija. Veljavne izbire so: %s", ['firework'] = "Pritisnite ~y~G~w~, da uporabite ognjemet", ['poop'] = "Pritisnite ~y~G~w~, da opravite veliko potrebo", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/sq.lua b/resources/[standalone]/rpemotes-reborn/locales/sq.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/sq.lua rename to resources/[standalone]/rpemotes-reborn/locales/sq.lua index f0de0dacb..d48d91ef7 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/sq.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/sq.lua @@ -4,12 +4,8 @@ Locales['sq'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Emotet e Kรซrcimit", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Emotet e Kafshรซve", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Emotet e Pรซrparave", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Tรซ preferuar", - ['favoriteinfo'] = "Zgjidh njรซ emote kรซtu pรซr ta caktuar si tรซ preferuarin tรซnd.", - ['rfavorite'] = "Rivendos tรซ preferuarin", ['prop2info'] = "โ“ Emotet e Pรซrparave mund tรซ gjenden nรซ fund", ['set'] = "Vendos (", - ['setboundemote'] = ") tรซ jetรซ emote e lidhur?", ['newsetemote'] = "~w~ รซshtรซ tani emota e lidhur, shtyp ~g~CapsLock~w~ pรซr ta pรซrdorur.", ['cancelemote'] = "~h~~r~ Anulo Emoten ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Anulon emoten qรซ รซshtรซ duke u luajtur momentalisht", @@ -54,8 +50,6 @@ Locales['sq'] = { ['searchinputtitle'] = "Kรซrko:", ['searchmenudesc'] = "rezultat(e) pรซr", ['searchnoresult'] = "Asnjรซ rezultat pรซr kรซrkimin", - ['searchshifttofav'] = "Mbaj Shift tรซ majtรซ dhe shtyp enter pรซr ta caktuar si tรซ preferuar.", - ['searchcantsetfav'] = "Emotet e ndara nuk mund tรซ caktohen si tรซ preferuara.", ['invalidvariation'] = "Variacioni i teksturรซs i pavlefshรซm. Zgjedhjet e vlefshme janรซ: %s", ['firework'] = "Shtyp ~y~G~w~ pรซr tรซ pรซrdorur fenerin", ['poop'] = "Shtyp ~y~G~w~ pรซr tรซ bรซrรซ qรซ tรซ defekosh", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/sr.lua b/resources/[standalone]/rpemotes-reborn/locales/sr.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/sr.lua rename to resources/[standalone]/rpemotes-reborn/locales/sr.lua index 203b8766e..4cfcdb39a 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/sr.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/sr.lua @@ -4,12 +4,8 @@ Locales['sr'] = { ['danceemotes'] = "๐Ÿ•บ Plesovi", ['animalemotes'] = "๐Ÿฉ ลฝivotinjske Animacije", ['propemotes'] = "๐Ÿ“ฆ Animacije Sa Predmetima", - ['favoriteemotes'] = "๐ŸŒŸ Omiljeno", - ['favoriteinfo'] = "Izaberite animaciju ovdje da je stavite kao omiljenu", - ['rfavorite'] = "Resetuj omiljeno", ['prop2info'] = "โ“ Animacije sa predmetima se mogu naฤ‡i na kraju", ['set'] = "Postavi (", - ['setboundemote'] = ") da bude tvoji bound-ana animacija?", ['newsetemote'] = "~w~ je sada tvoja bound-ana animacija, pritisni ~g~CapsLock~w~ da je uradiลก.", ['cancelemote'] = "Prekini Animaciju ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ Prekine animaciju koju trenutno radiลก", @@ -53,8 +49,6 @@ Locales['sr'] = { ['searchinputtitle'] = "Pretraลพi:", ['searchmenudesc'] = "rezultat(a) za", ['searchnoresult'] = "Nema rezultata za pretraลพivanje", - ['searchshifttofav'] = "Drลพi L-Shift i pritisni Enter da staviลก kao tvoje omiljeno.", - ['searchcantsetfav'] = "Druลกtvene Animacije ne mogu biti omiljene.", ['invalidvariation'] = "Nevaลพeฤ‡a varijacija teksture. Vaลพeฤ‡e selekcije su: %s", ['firework'] = "Pritisni ~y~G~w~ da koristiลก vatromet", ['poop'] = "Pritisni ~y~G~w~ da kakiลก", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/sv.lua b/resources/[standalone]/rpemotes-reborn/locales/sv.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/sv.lua rename to resources/[standalone]/rpemotes-reborn/locales/sv.lua index b27df6a57..e5818d888 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/sv.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/sv.lua @@ -4,12 +4,8 @@ Locales['sv'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Dans Emotes", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Djur Emotes", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ Objekt Emotes", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favorit", - ['favoriteinfo'] = "Vรคlj en emote fรถr att stรคlla in den som din favorit.", - ['rfavorite'] = "ร…terstรคll favorit.", ['prop2info'] = "โ“ Objekt Emotes finns lรคngst ner i listan.", ['set'] = "Sรคtt (", - ['setboundemote'] = ") till din favorit emote?", ['newsetemote'] = "~w~ รคr nu din favorit emote, tryck ~g~CapsLock~w~ fรถr att anvรคnda den.", ['cancelemote'] = "~h~~r~ Avbryt Emote ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ avbryter nuvarande spelande emote.", @@ -54,8 +50,6 @@ Locales['sv'] = { ['searchinputtitle'] = "Sรถk:", ['searchmenudesc'] = "resultat pรฅ", ['searchnoresult'] = "Inga resultat hittades pรฅ", - ['searchshifttofav'] = "Hรฅll ned L-Shift och tryck pรฅ enter fรถr att stรคlla in som favorit.", - ['searchcantsetfav'] = "Delade Emotes kan inte stรคllas in som favoriter.", ['invalidvariation'] = "Ogiltig texturvariation. Giltiga val รคr: %s", ['firework'] = "Tryck ~y~G~w~ fรถr att avfyra dina fyrverkerier", ['poop'] = "Tryck ~y~G~w~ fรถr att bajsa", -- Translated using smodin.io diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/tr.lua b/resources/[standalone]/rpemotes-reborn/locales/tr.lua similarity index 92% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/tr.lua rename to resources/[standalone]/rpemotes-reborn/locales/tr.lua index 08287c579..de283f4e4 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/tr.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/tr.lua @@ -4,12 +4,8 @@ Locales['tr'] = { ['danceemotes'] = "๐Ÿ•บ Dans Animasyonlarฤฑ", ['animalemotes'] = "๐Ÿฉ Hayvan Animasyonlarฤฑ", ['propemotes'] = "๐Ÿ“ฆ EลŸyalarฤฑ Animasyonlar", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ Favoriler", - ['favoriteinfo'] = "Favori olarak seรงmek iรงin buradan bir animasyon seรงin", - ['rfavorite'] = "Favorileri sฤฑfฤฑrla", ['prop2info'] = "โ“ EลŸyalฤฑ animasyonlar sonda bulunur", ['set'] = "Set (", - ['setboundemote'] = ") animasyonu baฤŸlansฤฑn mฤฑ?", ['newsetemote'] = "~w~ animasyonu baฤŸlandฤฑ, kullanmak iรงin ~g~CapsLock~w~ tuลŸuna basฤฑn", ['cancelemote'] = "Animasyonu iptal et ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ ลžu anki animasyonu iptal eder", @@ -63,8 +59,6 @@ Locales['tr'] = { ['searchinputtitle'] = "Ara:", ['searchmenudesc'] = "sonuรงlar:", ['searchnoresult'] = "Animasyon bulunamadฤฑ", - ['searchshifttofav'] = "Animasyonu favori eklemek iรงin LShift + Enter tuลŸlarฤฑna basฤฑn", - ['searchcantsetfav'] = "Ortak animasyonlar favori olarak eklenemez", ['invalidvariation'] = "Geรงersiz doku. Geรงerli dokular: %s", ['firework'] = "Havai fiลŸeฤŸi kullanmak iรงin ~y~G~w~ tuลŸuna basฤฑn", ['poop'] = "Kaka yapmak iรงin ~y~G~w~ tuลŸuna basฤฑn", @@ -91,7 +85,6 @@ Locales['tr'] = { -- Key maps ['register_cancel_emote'] = "ลžu anki animasyonu iptal et", ['register_open_menu'] = "Animasyon menรผsรผnรผ aรง", - ['register_fav_anim'] = "Favori animasyonuna gir", ['register_handsup'] = "Ellerini kaldฤฑr", ['register_crouch'] = "EฤŸil", ['register_crawl'] = "Sรผrรผn", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/vi.lua b/resources/[standalone]/rpemotes-reborn/locales/vi.lua similarity index 90% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/vi.lua rename to resources/[standalone]/rpemotes-reborn/locales/vi.lua index 24fb9688b..05f9082ed 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/vi.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/vi.lua @@ -4,12 +4,8 @@ Locales['vi'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ Nhแบฃy nhรณt", ['animalemotes'] = "~h~~p~ ๐Ÿฉ Thรบ cฦฐng", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ ฤแป“ vแบญt", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ ฦฏa thรญch", - ['favoriteinfo'] = "Hรฃy chแปn 1 hร nh ฤ‘แป™ng vร  ฤ‘ฦฐa vร o mแปฅc ฦฐa thรญch.", - ['rfavorite'] = "Xรณa toร n bแป™ ฦฏa thรญch", ['prop2info'] = "โ“ Hร nh ฤ‘แป™ng liรชn quan ฤ‘แบฟn ฤ‘แป“ vแบญt sแบฝ แปŸ cuแป‘i.", ['set'] = "ฤแบทt (", - ['setboundemote'] = ") Lร m hร nh ฤ‘แป™ng ฦฐa thรญch?", ['newsetemote'] = "~w~ ฤ‘รฃ ฤ‘ฦฐแปฃc ฤ‘แบทt, Bแบฅm ~g~CapsLock~w~ ฤ‘แปƒ sแปญ dแปฅng.", ['cancelemote'] = "~h~~r~ Hแปงy hร nh ฤ‘แป™ng ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ ฤ‘แปƒ hแปงy hร nh ฤ‘แป™ng", @@ -54,8 +50,6 @@ Locales['vi'] = { ['searchinputtitle'] = "Tรฌm kiแบฟm:", ['searchmenudesc'] = "Kแบฟt quแบฃ cho", ['searchnoresult'] = "Khรดng cรณ kแบฟt quแบฃ", - ['searchshifttofav'] = "Giแปฏ l-shift vร  nhแบฅn enter ฤ‘แปƒ ฤ‘แบทt lร m hร nh ฤ‘แป™ng yรชu thรญch.", - ['searchcantsetfav'] = "รกc biแปƒu tฦฐแปฃng ฤ‘ฦฐแปฃc chia sแบป khรดng thแปƒ ฤ‘ฦฐแปฃc ฤ‘แบทt lร m mแปฅc yรชu thรญch.", ['invalidvariation'] = "Biแบฟn thแปƒ kแบฟt cแบฅu khรดng hแปฃp lแป‡.Cรกc lแปฑa chแปn hแปฃp lแป‡ lร : %s", ['firework'] = "Nhแบฅn ~y~G~w~ ฤแปƒ sแปญ dแปฅng phรกo hoa", ['poop'] = "Nhแบฅn ~y~G~w~ ฤ‘แปƒ แป‹", -- Translated using smodin.io diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/zhcn.lua b/resources/[standalone]/rpemotes-reborn/locales/zhcn.lua similarity index 92% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/zhcn.lua rename to resources/[standalone]/rpemotes-reborn/locales/zhcn.lua index bfd07b2c5..fb716aa21 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/zhcn.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/zhcn.lua @@ -4,12 +4,8 @@ Locales['zhcn'] = { ['danceemotes'] = "๐Ÿ•บ ่ˆž่นˆๅŠจไฝœ", ['animalemotes'] = "๐Ÿฉ ๅŠจ็‰ฉๅŠจไฝœ", ['propemotes'] = "๐Ÿ“ฆ ้“ๅ…ทๅŠจไฝœ", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ ๆ”ถ่—", - ['favoriteinfo'] = "ๅœจ่ฟ™้‡Œ้€‰ๆ‹ฉไธ€ไธชๅŠจไฝœไฝœไธบๆ”ถ่—ใ€‚", - ['rfavorite'] = "้‡็ฝฎๆ”ถ่—", ['prop2info'] = "โ“ ้“ๅ…ทๅŠจไฝœไฝไบŽๆœซๅฐพ", ['set'] = "่ฎพ็ฝฎ (", - ['setboundemote'] = ") ไธบไฝ ็š„็ป‘ๅฎšๅŠจไฝœ?", ['newsetemote'] = "~w~ ็Žฐๅœจๆ˜ฏไฝ ็š„็ป‘ๅฎšๅŠจไฝœ๏ผŒๆŒ‰ ~g~CapsLock~w~ ไฝฟ็”จๅฎƒใ€‚", ['cancelemote'] = "ๅ–ๆถˆๅŠจไฝœ ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ ๅ–ๆถˆๅฝ“ๅ‰็š„ๅŠจไฝœ", @@ -63,8 +59,6 @@ Locales['zhcn'] = { ['searchinputtitle'] = "ๆœ็ดข:", ['searchmenudesc'] = "ๆœ็ดข็ป“ๆžœ", ['searchnoresult'] = "ๆฒกๆœ‰ๆœ็ดข็ป“ๆžœ", - ['searchshifttofav'] = "ๆŒ‰ไฝ L-Shift ๅนถๆŒ‰ๅ›ž่ฝฆ้”ฎ่ฎพ็ฝฎไธบๆ”ถ่—ใ€‚", - ['searchcantsetfav'] = "ๅ…ฑไบซๅŠจไฝœไธ่ƒฝ่ฎพ็ฝฎไธบๆ”ถ่—ใ€‚", ['invalidvariation'] = "ๆ— ๆ•ˆ็š„็บน็†ๅ˜ไฝ“ใ€‚ๆœ‰ๆ•ˆ้€‰ๆ‹ฉไธบ: %s", ['firework'] = "ๆŒ‰ ~y~G~w~ ไฝฟ็”จ็ƒŸ่Šฑ", ['poop'] = "ๆŒ‰ ~y~G~w~ ๅคงไพฟ", @@ -91,7 +85,6 @@ Locales['zhcn'] = { -- ๆŒ‰้”ฎๆ˜ ๅฐ„ ['register_cancel_emote'] = "ๅ–ๆถˆๅฝ“ๅ‰ๅŠจไฝœ", ['register_open_menu'] = "ๆ‰“ๅผ€ๅŠจไฝœ่œๅ•", - ['register_fav_anim'] = "ไฝฟ็”จไฝ ๆœ€ๅ–œๆฌข็š„ๅŠจไฝœ", ['register_handsup'] = "ไธพๆ‰‹", ['register_crouch'] = "่นฒไธ‹", ['register_crawl'] = "็ˆฌ่กŒ", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/zhtw.lua b/resources/[standalone]/rpemotes-reborn/locales/zhtw.lua similarity index 91% rename from resources/[standalone]/rpemotes-reborn-1.8.5/locales/zhtw.lua rename to resources/[standalone]/rpemotes-reborn/locales/zhtw.lua index 1f7b72274..c577cfbca 100644 --- a/resources/[standalone]/rpemotes-reborn-1.8.5/locales/zhtw.lua +++ b/resources/[standalone]/rpemotes-reborn/locales/zhtw.lua @@ -4,12 +4,8 @@ Locales['zhtw'] = { ['danceemotes'] = "~h~~p~ ๐Ÿ•บ ่ˆž่นˆๅ‹•ไฝœ", ['animalemotes'] = "~h~~p~ ๐Ÿฉ ๅ‹•็‰ฉๅ‹•ไฝœ", ['propemotes'] = "~h~~p~ ๐Ÿ“ฆ ็‰ฉๅ“ๅ‹•ไฝœ", - ['favoriteemotes'] = "~h~~y~ ๐ŸŒŸ ๆ”ถ่—", - ['favoriteinfo'] = "ๅœจๆญค่™•้ธๆ“‡ๅฃนๅ€‹ๅ‹•ไฝœไธฆๅฐ‡ๅ…ถ่จญ็‚บๆ”ถ่—ใ€‚", - ['rfavorite'] = "้‡็ฝฎๆ”ถ่—", ['prop2info'] = "โ“ ็‰ฉๅ“ๅ‹•ไฝœๅœจๆœ€ๅพŒ้ข", ['set'] = "่จญ็ฝฎ (", - ['setboundemote'] = ") ็‚บ็ถๅฎšๅ‹•ไฝœ๏ผŸ", ['newsetemote'] = "~w~ ๅทฒ่จญ็ฝฎ็‚บๅฆณ็š„็ถๅฎšๅ‹•ไฝœ๏ผŒๆŒ‰ ~g~CapsLock~w~ ไฝฟ็”จใ€‚", ['cancelemote'] = "~h~~r~ ๅ–ๆถˆๅ‹•ไฝœ ๐Ÿšท", ['cancelemoteinfo'] = "~r~X~w~ ๅ–ๆถˆ็•ถๅ‰ๅ‹•ไฝœ", @@ -54,8 +50,6 @@ Locales['zhtw'] = { ['searchinputtitle'] = "ๆœ็ดข:", ['searchmenudesc'] = " ๆœ‰ %s ๅ€‹็ตๆžœ๏ผš", ['searchnoresult'] = " ๆฒ’ๆœ‰ๆœ็ดข็ตๆžœใ€‚", - ['searchshifttofav'] = "ๆŒ‰ไฝ L-Shift ไธฆๆŒ‰ๅ›ž่ปŠ้ต่จญ็ฝฎ็‚บๆ”ถ่—ใ€‚", - ['searchcantsetfav'] = "ๅ…ฑไบซๅ‹•ไฝœ็„กๆณ•่จญ็ฝฎ็‚บๆ”ถ่—ใ€‚", ['invalidvariation'] = "็ด‹็†้ก่‰ฒ็„กๆ•ˆใ€‚ๆœ‰ๆ•ˆ้ธๆ“‡็‚บ: %s", ['firework'] = "ๆŒ‰ ~y~G~w~ ๆ”พ็…™่Šฑ", ['poop'] = "ๆŒ‰ ~y~G~w~ ๆŽ’ไพฟ", diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/001.png b/resources/[standalone]/rpemotes-reborn/screenshots/001.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/001.png rename to resources/[standalone]/rpemotes-reborn/screenshots/001.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/002.png b/resources/[standalone]/rpemotes-reborn/screenshots/002.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/002.png rename to resources/[standalone]/rpemotes-reborn/screenshots/002.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/003.png b/resources/[standalone]/rpemotes-reborn/screenshots/003.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/003.png rename to resources/[standalone]/rpemotes-reborn/screenshots/003.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/004.jpeg b/resources/[standalone]/rpemotes-reborn/screenshots/004.jpeg similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/004.jpeg rename to resources/[standalone]/rpemotes-reborn/screenshots/004.jpeg diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/005.jpg b/resources/[standalone]/rpemotes-reborn/screenshots/005.jpg similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/005.jpg rename to resources/[standalone]/rpemotes-reborn/screenshots/005.jpg diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/006.jpeg b/resources/[standalone]/rpemotes-reborn/screenshots/006.jpeg similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/006.jpeg rename to resources/[standalone]/rpemotes-reborn/screenshots/006.jpeg diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/007.jpeg b/resources/[standalone]/rpemotes-reborn/screenshots/007.jpeg similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/007.jpeg rename to resources/[standalone]/rpemotes-reborn/screenshots/007.jpeg diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/008.png b/resources/[standalone]/rpemotes-reborn/screenshots/008.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/008.png rename to resources/[standalone]/rpemotes-reborn/screenshots/008.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/009.jpeg b/resources/[standalone]/rpemotes-reborn/screenshots/009.jpeg similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/009.jpeg rename to resources/[standalone]/rpemotes-reborn/screenshots/009.jpeg diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/010.png b/resources/[standalone]/rpemotes-reborn/screenshots/010.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/010.png rename to resources/[standalone]/rpemotes-reborn/screenshots/010.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/011.png b/resources/[standalone]/rpemotes-reborn/screenshots/011.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/011.png rename to resources/[standalone]/rpemotes-reborn/screenshots/011.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/012.png b/resources/[standalone]/rpemotes-reborn/screenshots/012.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/012.png rename to resources/[standalone]/rpemotes-reborn/screenshots/012.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/013.png b/resources/[standalone]/rpemotes-reborn/screenshots/013.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/013.png rename to resources/[standalone]/rpemotes-reborn/screenshots/013.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/014.png b/resources/[standalone]/rpemotes-reborn/screenshots/014.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/014.png rename to resources/[standalone]/rpemotes-reborn/screenshots/014.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/015.png b/resources/[standalone]/rpemotes-reborn/screenshots/015.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/015.png rename to resources/[standalone]/rpemotes-reborn/screenshots/015.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/016.png b/resources/[standalone]/rpemotes-reborn/screenshots/016.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/016.png rename to resources/[standalone]/rpemotes-reborn/screenshots/016.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/customanims.png b/resources/[standalone]/rpemotes-reborn/screenshots/customanims.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/customanims.png rename to resources/[standalone]/rpemotes-reborn/screenshots/customanims.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/extractor.png b/resources/[standalone]/rpemotes-reborn/screenshots/extractor.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/extractor.png rename to resources/[standalone]/rpemotes-reborn/screenshots/extractor.png diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/pfxcoords.png b/resources/[standalone]/rpemotes-reborn/screenshots/pfxcoords.png similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/screenshots/pfxcoords.png rename to resources/[standalone]/rpemotes-reborn/screenshots/pfxcoords.png diff --git a/resources/[standalone]/rpemotes-reborn/server/Server.lua b/resources/[standalone]/rpemotes-reborn/server/Server.lua new file mode 100644 index 000000000..d2dafa291 --- /dev/null +++ b/resources/[standalone]/rpemotes-reborn/server/Server.lua @@ -0,0 +1,164 @@ +RegisterNetEvent("rpemotes:server:requestEmote", function(target, emotename, etype) + local source = source + if not Player(source).state.canEmote then return end + + if target == -1 then + return + end + + local distance = #(GetEntityCoords(GetPlayerPed(source)) - GetEntityCoords(GetPlayerPed(target))) + + if distance > 3 then + return + end + + TriggerClientEvent("rpemotes:client:requestEmote", target, emotename, etype, source) +end) + +RegisterNetEvent("rpemotes:server:confirmEmote", function(target, requestedemote, otheremote) + local source = source + + if target == -1 then + return + end + + local distance = #(GetEntityCoords(GetPlayerPed(source)) - GetEntityCoords(GetPlayerPed(target))) + + if distance > 3 then + return + end + + TriggerClientEvent("rpemotes:client:syncEmote", source, otheremote, target) + TriggerClientEvent("rpemotes:client:syncEmoteSource", target, requestedemote, source) +end) + +RegisterNetEvent("rpemotes:server:cancelEmote", function(target) + TriggerClientEvent("rpemotes:client:cancelEmote", target, source) +end) + +RegisterNetEvent("rpemotes:ptfx:sync", function(asset, name, offset, rot, bone, scale, color) + assert(type(asset) == "string", "[rpemotes] ptfx:sync: invalid asset for source: " .. tostring(source)) + assert(type(name) == "string", "[rpemotes] ptfx:sync: invalid name for source: " .. tostring(source)) + assert(type(offset) == "vector3", "[rpemotes] ptfx:sync: invalid offset for source: " .. tostring(source)) + assert(type(rot) == "vector3", "[rpemotes] ptfx:sync: invalid rot for source: " .. tostring(source)) + + local state = Player(source).state + + state:set("ptfxAsset", asset, true) + state:set("ptfxName", name, true) + state:set("ptfxOffset", offset, true) + state:set("ptfxRot", rot, true) + state:set("ptfxBone", bone, true) + state:set("ptfxScale", scale, true) + state:set("ptfxColor", color, true) + state:set("ptfxPropNet", nil, true) + state:set("ptfx", nil, true) +end) + +RegisterNetEvent("rpemotes:ptfx:syncProp", function(propNet) + local state = Player(source).state + if propNet then + local entity + local maxAttempts = 100 + local attempt = 0 + + repeat + entity = NetworkGetEntityFromNetworkId(propNet) + if entity and DoesEntityExist(entity) then + state:set("ptfxPropNet", propNet, true) + return + end + attempt = attempt + 1 + Wait(10) + until attempt >= maxAttempts + + print(("[rpemotes] Warning: Failed to find entity for propNet %s after %d attempts (source: %s)"):format(tostring(propNet), maxAttempts, tostring(source))) + end + + state:set("ptfxPropNet", nil, true) +end) + + +local function ExtractEmoteProps(format) + format = tonumber(format) + local xt, c, total = '', '', 0 + if format == 1 then + print("Selected format: ^2'prop_name',") + xt = "'"; c = "," + elseif format == 2 then + print("Selected format: ^2\"prop_name\",") + xt = "\""; c = "," + elseif format == 3 then + print("Selected format: ^2prop_name,") + elseif format == 4 then + print("Selected to calculate ^2total amount of emotes^0.") + else + print( + "\n### RPEmotes - Props Extractor ###\n\n^3Select output format^0\nAvailable formats:\n^11^0 - ^2'prop_name',\n^12^0 - ^2\"prop_name\",\n^13^0 - ^2prop_name\n^14^0 - ^2calculate total emotes\n\n^0Command usage example: ^5emoteextract 1^0\n") + return + end + + local animationFile = LoadResourceFile(GetCurrentResourceName(), "client/AnimationList.lua") + if not animationFile then return nil end + + local f, err = load(animationFile .. " return RP") + if err then return nil end + + local success, res = pcall(f) + if not success then return nil end + + if format == 4 then + local emoteTypes = { "Shared", "Dances", "AnimalEmotes", "Emotes", "PropEmotes", "Expressions", "Walks" } + local expressionAndWalkCount = 0 + local otherEmotesCount = 0 + + for _, emoteType in ipairs(emoteTypes) do + local count = 0 + for _ in pairs(res[emoteType]) do + count = count + 1 + end + if emoteType == "Expressions" or emoteType == "Walks" then + expressionAndWalkCount = expressionAndWalkCount + count + else + otherEmotesCount = otherEmotesCount + count + end + end + + local totalEmotes = expressionAndWalkCount + otherEmotesCount + + print("Total Expressions and Walks: ^3" .. expressionAndWalkCount .. "^0") + print("Total Emotes without Expressions and Walks: ^3" .. otherEmotesCount .. "^0") + print("Total Emotes: ^3" .. totalEmotes .. "^0") + else + local file = io.open(GetResourcePath(GetCurrentResourceName()) .. "/prop_list.lua", "w+") + if not file then + print("Failed to open file for writing.") + return + end + + local uniqueProps = {} + + for _, value in pairs(res.PropEmotes) do + if type(value) == "table" and value.AnimationOptions then + local prop = value.AnimationOptions.Prop + local secondProp = value.AnimationOptions.SecondProp + if prop then uniqueProps[prop] = true end + if secondProp then uniqueProps[secondProp] = true end + end + end + + -- Write all unique props to file + for propName in pairs(uniqueProps) do + file:write(xt .. propName .. xt .. c .. "\n") + total = total + 1 + end + + file:close() + print("Exported " .. total .. " props to ^2prop_list.lua^0") + end +end + +RegisterCommand("emoteextract", function(source, args) + if source > 0 then return end + ExtractEmoteProps(args[1]) +end, true) diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/server/Updates.lua b/resources/[standalone]/rpemotes-reborn/server/Updates.lua similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/server/Updates.lua rename to resources/[standalone]/rpemotes-reborn/server/Updates.lua diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@gen_female@base.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@gen_female@base.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@gen_female@base.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@gen_female@base.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@gen_male@base.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@gen_male@base.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@gen_male@base.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@gen_male@base.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_one@base.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_one@base.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_one@base.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_one@base.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_two@base.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_two@base.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_two@base.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_two@base.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_zero@base.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_zero@base.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_zero@base.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/-EcLiPsE-/facials@p_m_zero@base.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/41animpeacebaddie@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/41animpeacebaddie@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/41animpeacebaddie@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/41animpeacebaddie@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/baddiegyat.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/baddiegyat.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/baddiegyat.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/baddiegyat.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/bendova@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/bendova@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/bendova@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/bendova@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/nailpose@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/nailpose@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/nailpose@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/nailpose@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/stonerbabe@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/stonerbabe@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/41anims/stonerbabe@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/41anims/stonerbabe@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Amnilka/amnilka@photopose@couple@couplefirst.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Amnilka/amnilka@photopose@couple@couplefirst.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Amnilka/amnilka@photopose@couple@couplefirst.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Amnilka/amnilka@photopose@couple@couplefirst.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Amnilka/amnilka@photopose@female@homepack001.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Amnilka/amnilka@photopose@female@homepack001.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Amnilka/amnilka@photopose@female@homepack001.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Amnilka/amnilka@photopose@female@homepack001.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Amnilka/frabi@femalepose@solo@firstsport.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Amnilka/frabi@femalepose@solo@firstsport.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Amnilka/frabi@femalepose@solo@firstsport.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Amnilka/frabi@femalepose@solo@firstsport.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Amnilka/frabi@malepose@solo@firstsport.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Amnilka/frabi@malepose@solo@firstsport.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Amnilka/frabi@malepose@solo@firstsport.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Amnilka/frabi@malepose@solo@firstsport.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BoringNeptune/dancing_wave_part_one@anim.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BoringNeptune/dancing_wave_part_one@anim.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BoringNeptune/dancing_wave_part_one@anim.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BoringNeptune/dancing_wave_part_one@anim.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BoringNeptune/mj_thriller.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BoringNeptune/mj_thriller.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BoringNeptune/mj_thriller.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BoringNeptune/mj_thriller.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BoringNeptune/zombies_animations.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BoringNeptune/zombies_animations.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BoringNeptune/zombies_animations.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BoringNeptune/zombies_animations.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bz@give_love@anim.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bz@give_love@anim.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bz@give_love@anim.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bz@give_love@anim.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1_left.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1_left.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1_left.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1_left.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1_right.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1_right.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1_right.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army1_right.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2_left.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2_left.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2_left.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2_left.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2_right.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2_right.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2_right.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/bzzz@animation@army2_right.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/samnick@lighter@wave.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/samnick@lighter@wave.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/BzZziEmotes/samnick@lighter@wave.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/BzZziEmotes/samnick@lighter@wave.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose1cmg@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose1cmg@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose1cmg@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose1cmg@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose1pack1anim1@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose1pack1anim1@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose1pack1anim1@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose1pack1anim1@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose1pack1anim2@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose1pack1anim2@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose1pack1anim2@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose1pack1anim2@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose2cmg@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose2cmg@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose2cmg@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose2cmg@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose2pack1anim1@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose2pack1anim1@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose2pack1anim1@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose2pack1anim1@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose2pack1anim2@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose2pack1anim2@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose2pack1anim2@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose2pack1anim2@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose3pack1anim1@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose3pack1anim1@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose3pack1anim1@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose3pack1anim1@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose3pack1anim2@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose3pack1anim2@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/couplepose3pack1anim2@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/couplepose3pack1anim2@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/skateboardposecmganimation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/skateboardposecmganimation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CMGMods/skateboardposecmganimation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CMGMods/skateboardposecmganimation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@couple13.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@couple13.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@couple13.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@couple13.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@couple14.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@couple14.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@couple14.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@couple14.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo17.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo17.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo17.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo17.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo18.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo18.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo18.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo18.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo32.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo32.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo32.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo32.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo34.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo34.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo34.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@duo34.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single110a.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single110a.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single110a.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single110a.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single110b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single110b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single110b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single110b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single12.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single12.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single12.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single12.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single14.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single14.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single14.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single14.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single17.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single17.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single17.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single17.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single23.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single23.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single23.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single23.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single47.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single47.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single47.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single47.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single54.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single54.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single54.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single54.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single63.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single63.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single63.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single63.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single77.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single77.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single77.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single77.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single79.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single79.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single79.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single79.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single80.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single80.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single80.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single80.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single81.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single81.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single81.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single81.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single83.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single83.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single83.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single83.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single89.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single89.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single89.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single89.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single90.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single90.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single90.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@single90.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate1.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate1.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate1.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate1.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate4.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate4.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate4.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ChocoholicAnimations/chocoholic@skate4.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_hold.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_hold.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_hold.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_hold.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_torch.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_torch.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_torch.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_torch.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_walk.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_walk.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_walk.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@hlstr_7360_walk.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@holding_side_vest.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@holding_side_vest.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@holding_side_vest.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@holding_side_vest.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@holding_siege_vest_side.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@holding_siege_vest_side.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@holding_siege_vest_side.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@holding_siege_vest_side.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@holster_hold_there.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@holster_hold_there.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@holster_hold_there.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@holster_hold_there.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@holster_walk_torch.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@holster_walk_torch.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@holster_walk_torch.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@holster_walk_torch.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@k9_pose.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@k9_pose.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@k9_pose.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@k9_pose.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_radio.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_radio.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_radio.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_radio.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_siege.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_siege.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_siege.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_siege.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_siege_2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_siege_2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_siege_2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@holding_vest_siege_2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@prep_gears.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@prep_gears.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@prep_gears.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@male@prep_gears.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@radio_left.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@radio_left.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@radio_left.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@radio_left.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@radio_pose_3.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@radio_pose_3.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@radio_pose_3.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@radio_pose_3.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@rifle_megaphone.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@rifle_megaphone.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/CrunchyCat Poses/anim@rifle_megaphone.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/CrunchyCat Poses/anim@rifle_megaphone.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@f_sitcool.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@f_sitcool.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@f_sitcool.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@f_sitcool.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@f_standarrogant.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@f_standarrogant.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@f_standarrogant.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@f_standarrogant.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@f_standcasual1.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@f_standcasual1.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@f_standcasual1.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@f_standcasual1.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@f_standcasual2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@f_standcasual2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@f_standcasual2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@f_standcasual2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand14.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand14.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand14.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand14.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand15.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand15.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand15.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand15.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand16.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand16.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand16.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand16.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand7.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand7.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand7.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand7.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand8.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand8.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand8.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand8.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand9.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand9.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@femalestand9.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@femalestand9.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@m_doublehands.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@m_doublehands.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@m_doublehands.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@m_doublehands.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@m_standhide.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@m_standhide.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@m_standhide.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@m_standhide.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@male_smoke.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@male_smoke.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@male_smoke.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@male_smoke.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@malestand2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@malestand2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@malestand2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@malestand2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@malestand3c.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@malestand3c.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@malestand3c.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@malestand3c.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@pose_male.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@pose_male.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@pose_male.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@pose_male.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@singlemale1.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@singlemale1.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@singlemale1.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@singlemale1.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@singlemale2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@singlemale2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@singlemale2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@singlemale2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@singlemalestand1.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@singlemalestand1.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@singlemalestand1.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@singlemalestand1.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@singlemalestand2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@singlemalestand2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@singlemalestand2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@singlemalestand2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@sitcarfemale.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@sitcarfemale.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@sitcarfemale.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@sitcarfemale.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@skateboard2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@skateboard2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@skateboard2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@skateboard2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@skateboard3.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@skateboard3.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DRXAmimations/drx@skateboard3.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DRXAmimations/drx@skateboard3.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/anim@male_selfie_06.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/anim@male_selfie_06.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/anim@male_selfie_06.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/anim@male_selfie_06.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/bad_girls_pose3@darks37.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/bad_girls_pose3@darks37.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/bad_girls_pose3@darks37.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/bad_girls_pose3@darks37.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/bat@sel.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/bat@sel.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/bat@sel.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/bat@sel.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/beach_1@janina234.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/beach_1@janina234.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/beach_1@janina234.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/beach_1@janina234.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/beach_4@janina234.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/beach_4@janina234.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/beach_4@janina234.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/beach_4@janina234.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/brugershot_dark_fixed@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/brugershot_dark_fixed@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/brugershot_dark_fixed@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/brugershot_dark_fixed@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/cop_badge_1@dad.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/cop_badge_1@dad.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/cop_badge_1@dad.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/cop_badge_1@dad.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/couple_singing_m@darks37.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/couple_singing_m@darks37.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/couple_singing_m@darks37.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/couple_singing_m@darks37.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/cross_arms@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/cross_arms@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/cross_arms@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/cross_arms@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/feet_stand_w@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/feet_stand_w@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/feet_stand_w@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/feet_stand_w@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/fist_face@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/fist_face@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/fist_face@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/fist_face@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/fuckm@nxsty.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/fuckm@nxsty.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/fuckm@nxsty.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/fuckm@nxsty.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/ganggirls_pose1@darks37.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/ganggirls_pose1@darks37.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/ganggirls_pose1@darks37.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/ganggirls_pose1@darks37.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/ganggirls_pose2@darks37.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/ganggirls_pose2@darks37.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/ganggirls_pose2@darks37.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/ganggirls_pose2@darks37.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/girl_groupe_b@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/girl_groupe_b@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/girl_groupe_b@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/girl_groupe_b@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/girl_groupe_d@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/girl_groupe_d@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/girl_groupe_d@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/girl_groupe_d@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/gun_ink@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/gun_ink@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/gun_ink@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/gun_ink@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/gun_prime_2@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/gun_prime_2@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/gun_prime_2@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/gun_prime_2@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/hold_flowers@dad.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/hold_flowers@dad.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/hold_flowers@dad.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/hold_flowers@dad.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_1@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_1@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_1@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_1@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_2@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_2@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_2@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_2@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_3@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_3@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_3@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_3@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_4@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_4@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_4@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_4@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_5@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_5@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/holding_book_5@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/holding_book_5@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/hoodie_hands@dad.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/hoodie_hands@dad.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/hoodie_hands@dad.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/hoodie_hands@dad.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/koko_male@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/koko_male@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/koko_male@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/koko_male@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/lay_controller@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/lay_controller@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/lay_controller@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/lay_controller@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/male_duo_a@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/male_duo_a@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/male_duo_a@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/male_duo_a@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/male_solo_1@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/male_solo_1@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/male_solo_1@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/male_solo_1@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/male_solo_3@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/male_solo_3@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/male_solo_3@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/male_solo_3@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/male_solo_4@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/male_solo_4@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/male_solo_4@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/male_solo_4@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_1@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_1@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_1@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_1@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_2@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_2@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_2@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_2@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_3@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_3@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_3@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_3@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_4@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_4@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_4@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_4@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_5_a@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_5_a@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mic_pose_5_a@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mic_pose_5_a@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mirror_selfie_1@janina234.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mirror_selfie_1@janina234.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mirror_selfie_1@janina234.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mirror_selfie_1@janina234.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mirror_selfie_8@daj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mirror_selfie_8@daj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/mirror_selfie_8@daj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/mirror_selfie_8@daj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/on_the_knees@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/on_the_knees@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/on_the_knees@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/on_the_knees@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/piano_play@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/piano_play@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/piano_play@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/piano_play@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pistol_b_b@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pistol_b_b@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pistol_b_b@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pistol_b_b@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/play_saxophone@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/play_saxophone@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/play_saxophone@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/play_saxophone@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_1@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_1@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_1@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_1@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_2@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_2@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_2@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_2@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_3@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_3@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_3@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_3@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_4@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_4@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_4@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_4@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_5@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_5@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/pool_pack_5@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/pool_pack_5@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/side_shoe_check@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/side_shoe_check@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/side_shoe_check@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/side_shoe_check@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/sit_bong@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/sit_bong@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/sit_bong@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/sit_bong@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/sit_cute_1@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/sit_cute_1@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/sit_cute_1@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/sit_cute_1@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/smoke_m@sel.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/smoke_m@sel.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/smoke_m@sel.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/smoke_m@sel.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_camera_1@dad.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_camera_1@dad.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_camera_1@dad.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_camera_1@dad.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_cute_6@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_cute_6@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_cute_6@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_cute_6@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_dab@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_dab@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_dab@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_dab@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_fem_1@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_fem_1@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_fem_1@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_fem_1@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_middlefinger@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_middlefinger@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/stand_middlefinger@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/stand_middlefinger@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/study_pc_finally_fixed@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/study_pc_finally_fixed@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/study_pc_finally_fixed@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/study_pc_finally_fixed@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/suitcase_phone@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/suitcase_phone@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/suitcase_phone@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/suitcase_phone@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/westside_cap@darksj.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/westside_cap@darksj.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/westside_cap@darksj.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/westside_cap@darksj.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/zimmerframe_walk@dark.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/zimmerframe_walk@dark.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DarkAnimations/zimmerframe_walk@dark.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DarkAnimations/zimmerframe_walk@dark.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DestinyCustoms/smokingweapon@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DestinyCustoms/smokingweapon@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/DestinyCustoms/smokingweapon@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/DestinyCustoms/smokingweapon@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Dollie_Mods/dollie_mods@follow_me_001.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Dollie_Mods/dollie_mods@follow_me_001.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Dollie_Mods/dollie_mods@follow_me_001.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Dollie_Mods/dollie_mods@follow_me_001.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Dollie_Mods/dollie_mods@follow_me_002.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Dollie_Mods/dollie_mods@follow_me_002.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Dollie_Mods/dollie_mods@follow_me_002.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Dollie_Mods/dollie_mods@follow_me_002.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding1a.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding1a.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding1a.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding1a.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding1b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding1b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding1b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding1b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding2a.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding2a.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding2a.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding2a.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding2b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding2b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding2b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/EnchantedBrwny@wedding2b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_illum.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_illum.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_illum.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_illum.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_pack000.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_pack000.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_pack000.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_pack000.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_sign.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_sign.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_sign.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/EnchantedBrwny/ebrwny_sign.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale10.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale10.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale10.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale10.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale8.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale8.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale8.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale8.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale9.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale9.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale9.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissfemale9.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale10.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale10.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale10.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale10.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale8.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale8.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale8.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale8.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale9.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale9.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale9.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/GenesisMods/genesismods_kissme@kissmale9.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@amb@beach_party@.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@amb@beach_party@.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@amb@beach_party@.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@amb@beach_party@.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@amb@vip_bar@.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@amb@vip_bar@.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@amb@vip_bar@.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@amb@vip_bar@.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationfemale@bang_bang.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationfemale@bang_bang.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationfemale@bang_bang.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationfemale@bang_bang.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationfemale@coin_roll_and_toss.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationfemale@coin_roll_and_toss.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationfemale@coin_roll_and_toss.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationfemale@coin_roll_and_toss.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationmale@bang_bang.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationmale@bang_bang.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationmale@bang_bang.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationmale@bang_bang.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationmale@coin_roll_and_toss.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationmale@coin_roll_and_toss.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationmale@coin_roll_and_toss.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intcelebrationmale@coin_roll_and_toss.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intupperbang_bang.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intupperbang_bang.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intupperbang_bang.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intupperbang_bang.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intuppercoin_roll_and_toss.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intuppercoin_roll_and_toss.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intuppercoin_roll_and_toss.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@mp_player_intuppercoin_roll_and_toss.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@special_peds@casino@vince@wall@cas_vince_ig3.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@special_peds@casino@vince@wall@cas_vince_ig3.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/HeySlickThatsMe/anim@special_peds@casino@vince@wall@cas_vince_ig3.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/HeySlickThatsMe/anim@special_peds@casino@vince@wall@cas_vince_ig3.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose1.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose1.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose1.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose1.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose3.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose3.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose3.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose3.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose4.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose4.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose4.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose4.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose5.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose5.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose5.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LadyyShamrockk/shamrock@wallpose5.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@friendship007.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@friendship007.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@friendship007.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@friendship007.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@friendship008.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@friendship008.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@friendship008.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@friendship008.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie001.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie001.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie001.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie001.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie002.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie002.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie002.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie002.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie003.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie003.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie003.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie003.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie004.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie004.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie004.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie004.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie005.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie005.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie005.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@selfie005.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy003.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy003.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy003.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy003.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy004.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy004.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy004.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy004.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy005.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy005.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy005.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy005.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy006.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy006.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy006.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy006.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy009.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy009.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy009.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy009.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy012.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy012.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy012.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/LittleSpoon/littlespoon@sexy012.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Mads/mads@police_reaching_holster.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Mads/mads@police_reaching_holster.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Mads/mads@police_reaching_holster.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Mads/mads@police_reaching_holster.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/airforce@at_ease.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/airforce@at_ease.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/airforce@at_ease.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/airforce@at_ease.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/airforce@attention.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/airforce@attention.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/airforce@attention.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/airforce@attention.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/airforce@parade_rest.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/airforce@parade_rest.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/airforce@parade_rest.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/airforce@parade_rest.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/airforce@salute.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/airforce@salute.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/airforce@salute.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/airforce@salute.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/crouching@taking_selfie.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/crouching@taking_selfie.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/crouching@taking_selfie.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/crouching@taking_selfie.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/holding_wine@taking_selfie.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/holding_wine@taking_selfie.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/holding_wine@taking_selfie.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/holding_wine@taking_selfie.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/hooman@hugging_little_doggy.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/hooman@hugging_little_doggy.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/hooman@hugging_little_doggy.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/hooman@hugging_little_doggy.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/little_doggy@hugging_hooman.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/little_doggy@hugging_hooman.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/little_doggy@hugging_hooman.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/little_doggy@hugging_hooman.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/lying@on_couch_legs_crossed.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/lying@on_couch_legs_crossed.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/lying@on_couch_legs_crossed.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/lying@on_couch_legs_crossed.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/lying@on_grass.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/lying@on_grass.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/lying@on_grass.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/lying@on_grass.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/mirror_selfie@peace_sign.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/mirror_selfie@peace_sign.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/mirror_selfie@peace_sign.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/mirror_selfie@peace_sign.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@gatlax.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@gatlax.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@gatlax.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@gatlax.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@hearthands.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@hearthands.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@hearthands.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@hearthands.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@little_doggy_lying_down.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@little_doggy_lying_down.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@little_doggy_lying_down.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/misssnowie@little_doggy_lying_down.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/playing@with_controller.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/playing@with_controller.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/playing@with_controller.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/playing@with_controller.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/sign@hang_loose.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/sign@hang_loose.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/sign@hang_loose.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/sign@hang_loose.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/sign@hang_loose_casual.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/sign@hang_loose_casual.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/sign@hang_loose_casual.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/sign@hang_loose_casual.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/uwu@egirl.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/uwu@egirl.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/uwu@egirl.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/uwu@egirl.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/watch@looking_at.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/watch@looking_at.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MissSnowieEmotes/watch@looking_at.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MissSnowieEmotes/watch@looking_at.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/beachanims@free.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/beachanims@free.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/beachanims@free.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/beachanims@free.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/beachanims@molly.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/beachanims@molly.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/beachanims@molly.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/beachanims@molly.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/molly@boombox1.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/molly@boombox1.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/molly@boombox1.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/molly@boombox1.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/molly@megaphone.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/molly@megaphone.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/molly@megaphone.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/molly@megaphone.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/molly@megaphone2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/molly@megaphone2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MollyEmotes/molly@megaphone2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MollyEmotes/molly@megaphone2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@adorable.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@adorable.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@adorable.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@adorable.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@adorable_style.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@adorable_style.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@adorable_style.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@adorable_style.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@casual_composure_female01.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@casual_composure_female01.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@casual_composure_female01.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@casual_composure_female01.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@casual_composure_female02.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@casual_composure_female02.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@casual_composure_female02.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@casual_composure_female02.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@characterful_poses.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@characterful_poses.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@characterful_poses.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@characterful_poses.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@checked_shirt_squat_male.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@checked_shirt_squat_male.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@checked_shirt_squat_male.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@checked_shirt_squat_male.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@chin_support_on_floor.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@chin_support_on_floor.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@chin_support_on_floor.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@chin_support_on_floor.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@composed_photo_moments.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@composed_photo_moments.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@composed_photo_moments.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@composed_photo_moments.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@dark_appearance_with_bag_male.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@dark_appearance_with_bag_male.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@dark_appearance_with_bag_male.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@dark_appearance_with_bag_male.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@elegant_floor_hock.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@elegant_floor_hock.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@elegant_floor_hock.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@elegant_floor_hock.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_03.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_03.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_03.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_03.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_04.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_04.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_04.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_04.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_05.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_05.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_05.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_05.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_06.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_06.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_06.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_06.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_07.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_07.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_07.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_07.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_09.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_09.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_09.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_09.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_10.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_10.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_10.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_10.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_11.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_11.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_11.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@femalepose_11.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@finger_gun_pose.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@finger_gun_pose.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@finger_gun_pose.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@finger_gun_pose.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@gentleman_style_male.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@gentleman_style_male.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@gentleman_style_male.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@gentleman_style_male.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@helloween4_f.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@helloween4_f.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@helloween4_f.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@helloween4_f.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@leaf_friends_female.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@leaf_friends_female.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@leaf_friends_female.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@leaf_friends_female.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@leaf_friends_male.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@leaf_friends_male.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@leaf_friends_male.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@leaf_friends_male.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@models_in_action.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@models_in_action.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@models_in_action.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@models_in_action.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@phone_time_on_floor.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@phone_time_on_floor.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@phone_time_on_floor.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@phone_time_on_floor.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@photo_session_posing.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@photo_session_posing.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@photo_session_posing.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@photo_session_posing.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@photographic_journey_f.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@photographic_journey_f.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@photographic_journey_f.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@photographic_journey_f.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@rain_dreamy_pose.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@rain_dreamy_pose.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@rain_dreamy_pose.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@rain_dreamy_pose.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@school_uniform_expression.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@school_uniform_expression.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@school_uniform_expression.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@school_uniform_expression.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@selfie02_male.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@selfie02_male.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@selfie02_male.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@selfie02_male.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@thoughtful_man_m.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@thoughtful_man_m.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@thoughtful_man_m.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@thoughtful_man_m.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@tie_perfection_in_suit_male.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@tie_perfection_in_suit_male.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@tie_perfection_in_suit_male.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@tie_perfection_in_suit_male.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@urban_posing.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@urban_posing.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/MrWitt/mrwitt@urban_posing.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/MrWitt/mrwitt@urban_posing.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@dazzleme.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@dazzleme.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@dazzleme.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@dazzleme.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p1.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p1.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p1.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p1.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p10.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p10.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p10.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p10.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p3.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p3.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p3.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p3.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p4.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p4.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p4.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p4.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p5.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p5.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p5.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p5.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p6.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p6.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p6.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p6.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p7.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p7.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p7.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p7.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p8.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p8.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p8.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p8.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p9.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p9.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyx@mic@p9.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyx@mic@p9.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyxco@dresstoimpress.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyxco@dresstoimpress.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Prue/lunyxco@dresstoimpress.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Prue/lunyxco@dresstoimpress.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freepose01.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freepose01.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freepose01.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freepose01.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freepose02.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freepose02.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freepose02.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freepose02.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freepose03.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freepose03.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freepose03.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freepose03.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freepose04.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freepose04.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freepose04.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freepose04.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie01.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie01.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie01.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie01.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie02.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie02.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie02.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie02.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie03.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie03.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie03.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Pupppy/pupppy@freeselfie03.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/fuckyouselfie@queensisters.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/fuckyouselfie@queensisters.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/fuckyouselfie@queensisters.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/fuckyouselfie@queensisters.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/handkylie@queensisters.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/handkylie@queensisters.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/handkylie@queensisters.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/handkylie@queensisters.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/heartselfiemirror@queensisters.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/heartselfiemirror@queensisters.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/heartselfiemirror@queensisters.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/heartselfiemirror@queensisters.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/selfiekilye@queensisters.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/selfiekilye@queensisters.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/selfiekilye@queensisters.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/selfiekilye@queensisters.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/sitdownonknees@queensisters.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/sitdownonknees@queensisters.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/sitdownonknees@queensisters.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/sitdownonknees@queensisters.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/sitkylie@queensisters.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/sitkylie@queensisters.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/QueenSistersAnimations/sitkylie@queensisters.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/QueenSistersAnimations/sitkylie@queensisters.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_f@generic_idles@std.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_f@generic_idles@std.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_f@generic_idles@std.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_f@generic_idles@std.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_m@generic_idles@std.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_m@generic_idles@std.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_m@generic_idles@std.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_m@generic_idles@std.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_p_m_one_idles@generic.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_p_m_one_idles@generic.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_p_m_one_idles@generic.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_p_m_one_idles@generic.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_p_m_two_idles@generic.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_p_m_two_idles@generic.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_p_m_two_idles@generic.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_p_m_two_idles@generic.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_p_m_zero_idles@generic.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_p_m_zero_idles@generic.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/RPEmotes/move_p_m_zero_idles@generic.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/RPEmotes/move_p_m_zero_idles@generic.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx@piggypack_a.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx@piggypack_a.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx@piggypack_a.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx@piggypack_a.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx@piggypack_b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx@piggypack_b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx@piggypack_b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx@piggypack_b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx@pose2.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx@pose2.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx@pose2.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx@pose2.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_1_a.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_1_a.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_1_a.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_1_a.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_1_b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_1_b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_1_b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_1_b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_2_a.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_2_a.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_2_a.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_2_a.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_2_b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_2_b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_2_b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_2_b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_3_a.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_3_a.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_3_a.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_3_a.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_3_b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_3_b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_3_b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_3_b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_4_a.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_4_a.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_4_a.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_4_a.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_4_b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_4_b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SapphireMods/mx_couple5_4_b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SapphireMods/mx_couple5_4_b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Soomey/sdrill@animation.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Soomey/sdrill@animation.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Soomey/sdrill@animation.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Soomey/sdrill@animation.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@air_squat.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@air_squat.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@air_squat.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@air_squat.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@byc_crunch.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@byc_crunch.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@byc_crunch.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@byc_crunch.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_folded.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_folded.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_folded.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_folded.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_forward.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_forward.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_forward.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_forward.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_laptop.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_laptop.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_laptop.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_laptop.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_selfie.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_selfie.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_selfie.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_selfie.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_tablet.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_tablet.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_tablet.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_sitting_tablet.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_smart_sitting.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_smart_sitting.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_smart_sitting.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_smart_sitting.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_smart_sitting_crossed.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_smart_sitting_crossed.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@female_smart_sitting_crossed.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@female_smart_sitting_crossed.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@femalearmchair.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@femalearmchair.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@femalearmchair.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@femalearmchair.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@jump_exc.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@jump_exc.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@jump_exc.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@jump_exc.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@jump_jack.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@jump_jack.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@jump_jack.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@jump_jack.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@situp.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@situp.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/SourisEmotes/mouse@situp.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/SourisEmotes/mouse@situp.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@egirl_1foot_selfie.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@egirl_1foot_selfie.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@egirl_1foot_selfie.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@egirl_1foot_selfie.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_beach_booty_selfie.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_beach_booty_selfie.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_beach_booty_selfie.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_beach_booty_selfie.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_couple_01.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_couple_01.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_couple_01.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_couple_01.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_couple_03.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_couple_03.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_couple_03.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_couple_03.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_couple_03_b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_couple_03_b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_couple_03_b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_couple_03_b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_egirl_cute_selfie.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_egirl_cute_selfie.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_egirl_cute_selfie.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_egirl_cute_selfie.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_floor_slutarch_selfie.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_floor_slutarch_selfie.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_floor_slutarch_selfie.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_floor_slutarch_selfie.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_gunbunny_rifle_photo.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_gunbunny_rifle_photo.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_gunbunny_rifle_photo.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_gunbunny_rifle_photo.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_laying_sexy.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_laying_sexy.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_laying_sexy.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_laying_sexy.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_14.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_14.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_14.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_14.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_15.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_15.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_15.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_15.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_17.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_17.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_17.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_17.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_21.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_21.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_21.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_21.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_photo_cute.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_photo_cute.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_photo_cute.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_photo_cute.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_showoff.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_showoff.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_showoff.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_showoff.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_showoff_two.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_showoff_two.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_model_showoff_two.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_model_showoff_two.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_selfie_04.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_selfie_04.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_selfie_04.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_selfie_04.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_selfie_cute.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_selfie_cute.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_selfie_cute.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_selfie_cute.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_selfie_risque.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_selfie_risque.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_selfie_risque.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_selfie_risque.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_sit_01.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_sit_01.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@female_sit_01.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@female_sit_01.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@fuck_you_selfie.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@fuck_you_selfie.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@fuck_you_selfie.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@fuck_you_selfie.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_basketball_03.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_basketball_03.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_basketball_03.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_basketball_03.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_bskball_hold.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_bskball_hold.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_bskball_hold.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_bskball_hold.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_bskball_photo_pose.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_bskball_photo_pose.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_bskball_photo_pose.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_bskball_photo_pose.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_couple_01.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_couple_01.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_couple_01.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_couple_01.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_couple_03.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_couple_03.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_couple_03.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_couple_03.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_couple_03_b.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_couple_03_b.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_couple_03_b.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_couple_03_b.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_drinking_01.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_drinking_01.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_drinking_01.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_drinking_01.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_insta_selfie.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_insta_selfie.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_insta_selfie.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_insta_selfie.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_model_03.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_model_03.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_model_03.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_model_03.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_model_08.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_model_08.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_model_08.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_model_08.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_model_11.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_model_11.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_model_11.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_model_11.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_selfie_08.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_selfie_08.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_selfie_08.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_selfie_08.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_selfie_09.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_selfie_09.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@male_selfie_09.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@male_selfie_09.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@model_kylie_insta.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@model_kylie_insta.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@model_kylie_insta.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@model_kylie_insta.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@selfie_floor_cute.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@selfie_floor_cute.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@selfie_floor_cute.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@selfie_floor_cute.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@sitting_thot.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@sitting_thot.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/anim@sitting_thot.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/anim@sitting_thot.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/smo@milkshake_idle.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/smo@milkshake_idle.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/Struggleville/smo@milkshake_idle.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/Struggleville/smo@milkshake_idle.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/VNSIanims/male_gun@vanessssi.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/VNSIanims/male_gun@vanessssi.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/VNSIanims/male_gun@vanessssi.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/VNSIanims/male_gun@vanessssi.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/WolfSquareEmotes/eagle@boypose04.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/WolfSquareEmotes/eagle@boypose04.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/WolfSquareEmotes/eagle@boypose04.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/WolfSquareEmotes/eagle@boypose04.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/WolfSquareEmotes/eagle@boypose05.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/WolfSquareEmotes/eagle@boypose05.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/WolfSquareEmotes/eagle@boypose05.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/WolfSquareEmotes/eagle@boypose05.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/WolfSquareEmotes/eagle@girlphonepose13.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/WolfSquareEmotes/eagle@girlphonepose13.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/WolfSquareEmotes/eagle@girlphonepose13.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/WolfSquareEmotes/eagle@girlphonepose13.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/WolfSquareEmotes/eagle@girlphonepose21.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/WolfSquareEmotes/eagle@girlphonepose21.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/WolfSquareEmotes/eagle@girlphonepose21.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/WolfSquareEmotes/eagle@girlphonepose21.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/corbs/aphrodite1@corbs.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/corbs/aphrodite1@corbs.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/corbs/aphrodite1@corbs.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/corbs/aphrodite1@corbs.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/corbs/aphrodite2@corbs.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/corbs/aphrodite2@corbs.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/corbs/aphrodite2@corbs.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/corbs/aphrodite2@corbs.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/corbs/aphrodite3@corbs.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/corbs/aphrodite3@corbs.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/corbs/aphrodite3@corbs.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/corbs/aphrodite3@corbs.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ultrahacx/custom@hold_umbrella.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ultrahacx/custom@hold_umbrella.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ultrahacx/custom@hold_umbrella.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ultrahacx/custom@hold_umbrella.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ultrahacx/custom@police.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ultrahacx/custom@police.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ultrahacx/custom@police.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ultrahacx/custom@police.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ultrahacx/ultra@propose.ycd b/resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ultrahacx/ultra@propose.ycd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Custom Emotes]/ultrahacx/ultra@propose.ycd rename to resources/[standalone]/rpemotes-reborn/stream/[Custom Emotes]/ultrahacx/ultra@propose.ycd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_bubblegum.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_bubblegum.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_bubblegum.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_bubblegum.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_cherry.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_cherry.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_cherry.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_cherry.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_chocolate.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_chocolate.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_chocolate.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_chocolate.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_coffee.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_coffee.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_coffee.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_coffee.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_doublechocolate.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_doublechocolate.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_doublechocolate.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_doublechocolate.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_frappe.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_frappe.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_frappe.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_frappe.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_lemon.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_lemon.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_lemon.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_lemon.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_mint.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_mint.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_mint.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_mint.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_raspberry.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_raspberry.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_raspberry.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_raspberry.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_salted.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_salted.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_salted.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_salted.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_strawberry.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_strawberry.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_strawberry.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_strawberry.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_vanilla.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_vanilla.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_cherryshake_vanilla.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_cherryshake_vanilla.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_heart.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_heart.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_heart.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_heart.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_heartfrappe.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_heartfrappe.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_heartfrappe.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_heartfrappe.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_bubblegum.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_bubblegum.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_bubblegum.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_bubblegum.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_cherry.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_cherry.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_cherry.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_cherry.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_chocolate.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_chocolate.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_chocolate.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_chocolate.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_coffee.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_coffee.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_coffee.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_coffee.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_doublechocolate.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_doublechocolate.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_doublechocolate.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_doublechocolate.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_frappe.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_frappe.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_frappe.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_frappe.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_lemon.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_lemon.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_lemon.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_lemon.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_mint.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_mint.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_mint.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_mint.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_raspberry.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_raspberry.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_raspberry.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_raspberry.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_rsaltedcaramel.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_rsaltedcaramel.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_rsaltedcaramel.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_rsaltedcaramel.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_strawberry.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_strawberry.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_strawberry.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_strawberry.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_vanilla.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_vanilla.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brum_shake_vanilla.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brum_shake_vanilla.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brummie_props.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brummie_props.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Brummiee/brummie_props.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Brummiee/brummie_props.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_food_kebab.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_food_kebab.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_food_kebab.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_food_kebab.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_food_marshmallow.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_food_marshmallow.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_food_marshmallow.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_food_marshmallow.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_food_melloburnt.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_food_melloburnt.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_food_melloburnt.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_food_melloburnt.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_food_mellopink.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_food_mellopink.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_food_mellopink.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_food_mellopink.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_props.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_props.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_props.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_props.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_stick_kebab.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_stick_kebab.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_stick_kebab.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_stick_kebab.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_stick_marshmallow.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_stick_marshmallow.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_stick_marshmallow.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_stick_marshmallow.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_stick_melloburnt.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_stick_melloburnt.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_stick_melloburnt.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_stick_melloburnt.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_stick_mellopink.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_stick_mellopink.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_camp_stick_mellopink.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_camp_stick_mellopink.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_event_easter_basket_b.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_event_easter_basket_b.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_event_easter_basket_b.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_event_easter_basket_b.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_event_easter_bunny_a.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_event_easter_bunny_a.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_event_easter_bunny_a.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_event_easter_bunny_a.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_event_easter_egg_d.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_event_easter_egg_d.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_event_easter_egg_d.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_event_easter_egg_d.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_dessert_a.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_dessert_a.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_dessert_a.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_dessert_a.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_gingerbread_a.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_gingerbread_a.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_gingerbread_a.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_gingerbread_a.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_a.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_a.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_a.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_a.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_b.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_b.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_b.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_b.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_c.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_c.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_c.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_c.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_d.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_d.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_d.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_d.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_e.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_e.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_e.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_lollipop_e.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_macaroon_a.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_macaroon_a.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_macaroon_a.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_macaroon_a.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_mug_a.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_mug_a.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_mug_a.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_mug_a.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_mug_b.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_mug_b.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_mug_b.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_mug_b.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_mulled_wine_a.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_mulled_wine_a.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_food_xmas_mulled_wine_a.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_food_xmas_mulled_wine_a.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_foodpack_croissant001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_foodpack_croissant001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_foodpack_croissant001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_foodpack_croissant001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_foodpack_donut001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_foodpack_donut001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_foodpack_donut001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_foodpack_donut001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_foodpack_donut002.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_foodpack_donut002.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_foodpack_donut002.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_foodpack_donut002.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_cherry.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_cherry.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_cherry.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_cherry.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_chocolate.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_chocolate.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_chocolate.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_chocolate.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_lemon.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_lemon.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_lemon.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_lemon.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_pistachio.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_pistachio.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_pistachio.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_pistachio.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_raspberry.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_raspberry.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_raspberry.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_raspberry.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_stracciatella.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_stracciatella.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_stracciatella.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_stracciatella.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_strawberry.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_strawberry.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_strawberry.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_strawberry.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_walnut.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_walnut.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_icecream_walnut.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_icecream_walnut.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_murder_axe001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_murder_axe001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_murder_axe001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_murder_axe001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_murder_machete001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_murder_machete001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_murder_machete001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_murder_machete001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_murderpack.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_murderpack.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_murderpack.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_murderpack.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_cake_baby_001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_cake_baby_001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_cake_baby_001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_cake_baby_001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_cake_birthday_001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_cake_birthday_001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_cake_birthday_001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_cake_birthday_001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_cake_casino001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_cake_casino001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_cake_casino001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_cake_casino001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_cake_love_001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_cake_love_001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_cake_love_001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_cake_love_001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_gift_orange.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_gift_orange.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_gift_orange.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_gift_orange.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_gift_purple.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_gift_purple.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_gift_purple.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_gift_purple.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_shop_basket_a.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_shop_basket_a.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_shop_basket_a.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_shop_basket_a.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_shop_basket_b.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_shop_basket_b.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_shop_basket_b.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_shop_basket_b.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_torch_fire001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_torch_fire001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_prop_torch_fire001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_prop_torch_fire001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_props.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_props.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/bzzz_props.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/bzzz_props.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/prop_bzzz_drugs_light001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/prop_bzzz_drugs_light001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/prop_bzzz_drugs_light001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/prop_bzzz_drugs_light001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/prop_bzzz_elektro_powerhouse001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/prop_bzzz_elektro_powerhouse001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/prop_bzzz_elektro_powerhouse001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/prop_bzzz_elektro_powerhouse001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/samnick_prop_lighter01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/samnick_prop_lighter01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/samnick_prop_lighter01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/samnick_prop_lighter01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/samnick_prop_lighter01.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/samnick_prop_lighter01.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/BzzziProps/samnick_prop_lighter01.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/BzzziProps/samnick_prop_lighter01.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/CandyApple/apple_1.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/CandyApple/apple_1.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/CandyApple/apple_1.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/CandyApple/apple_1.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/CandyApple/apple_1.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/CandyApple/apple_1.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/CandyApple/apple_1.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/CandyApple/apple_1.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/CandyApple/candy_1_texture.ytd b/resources/[standalone]/rpemotes-reborn/stream/[Props]/CandyApple/candy_1_texture.ytd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/CandyApple/candy_1_texture.ytd rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/CandyApple/candy_1_texture.ytd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Crowded1337/prop_amb_handbag_01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Crowded1337/prop_amb_handbag_01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Crowded1337/prop_amb_handbag_01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Crowded1337/prop_amb_handbag_01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/EP/pprp_icefishing.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/EP/pprp_icefishing.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/EP/pprp_icefishing.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/EP/pprp_icefishing.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/EP/pprp_icefishing_augur.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/EP/pprp_icefishing_augur.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/EP/pprp_icefishing_augur.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/EP/pprp_icefishing_augur.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/EP/pprp_icefishing_box_01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/EP/pprp_icefishing_box_01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/EP/pprp_icefishing_box_01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/EP/pprp_icefishing_box_01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/EP/pprp_icefishing_box_02.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/EP/pprp_icefishing_box_02.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/EP/pprp_icefishing_box_02.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/EP/pprp_icefishing_box_02.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/beanmachine_cup.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/beanmachine_cup.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/beanmachine_cup.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/beanmachine_cup.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/beanmachine_cup2.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/beanmachine_cup2.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/beanmachine_cup2.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/beanmachine_cup2.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/beanmachine_cup3.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/beanmachine_cup3.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/beanmachine_cup3.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/beanmachine_cup3.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/dumbbitchjuice.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/dumbbitchjuice.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/dumbbitchjuice.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/dumbbitchjuice.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/heart_balloon.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/heart_balloon.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/heart_balloon.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/heart_balloon.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/kaykaymods_props.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/kaykaymods_props.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/kaykaymods_props.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/kaykaymods_props.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/pride_heart_balloon.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/pride_heart_balloon.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KayKayMods/pride_heart_balloon.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KayKayMods/pride_heart_balloon.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzas.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzas.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzas.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzas.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice1.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice1.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice1.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice1.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice2.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice2.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice2.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice2.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice3.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice3.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice3.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice3.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice4.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice4.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice4.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice4.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice5.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice5.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice5.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/KnjghPizzaSlices/knjgh_pizzaslice5.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop02.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop02.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop02.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop02.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop03.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop03.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop03.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop03.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop04.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop04.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop04.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop04.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop05.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop05.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop05.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop05.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin02.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin02.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin02.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin02.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin03.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin03.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin03.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin03.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin04.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin04.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin04.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin04.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin05.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin05.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spin05.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spin05.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral02.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral02.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral02.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral02.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral03.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral03.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral03.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral03.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral04.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral04.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral04.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral04.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral05.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral05.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral05.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral05.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral06.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral06.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_lollipop_spiral06.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_lollipop_spiral06.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_props_lollipops.ytd b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_props_lollipops.ytd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_props_lollipops.ytd rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_props_lollipops.ytd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_props_lollipops.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_props_lollipops.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/NattyLollipops/natty_props_lollipops.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/NattyLollipops/natty_props_lollipops.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/pnwsigns.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/pnwsigns.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/pnwsigns.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/pnwsigns.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign.ytd b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign.ytd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign.ytd rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign.ytd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign_01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign_01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign_01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign_01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign_01.ytd b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign_01.ytd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign_01.ytd rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign_01.ytd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign_02.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign_02.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign_02.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign_02.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign_02.ytd b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign_02.ytd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PNWParksFan/prop_flagger_sign_02.ytd rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PNWParksFan/prop_flagger_sign_02.ytd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_cake.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_cake.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_cake.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_cake.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_cake2.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_cake2.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_cake2.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_cake2.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_cake3.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_cake3.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_cake3.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_cake3.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood1.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood1.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood1.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood1.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood2.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood2.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood2.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood2.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood6.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood6.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood6.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood6.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood7.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood7.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood7.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood7.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood8.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood8.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_christmasfood8.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_christmasfood8.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_freevalentinesday.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_freevalentinesday.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_freevalentinesday.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_freevalentinesday.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_freevalentinesday2.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_freevalentinesday2.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_freevalentinesday2.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_freevalentinesday2.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_freevalentinesday3.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_freevalentinesday3.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_freevalentinesday3.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_freevalentinesday3.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_props.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_props.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/PataMods/pata_props.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/PataMods/pata_props.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_blm.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_blm.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_blm.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_blm.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_boba.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_boba.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_boba.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_boba.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_boba2.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_boba2.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_boba2.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_boba2.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_boba3.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_boba3.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_boba3.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_boba3.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_pho.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_pho.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_pho.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_pho.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_props.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_props.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_props.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_props.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_spoon_pho.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_spoon_pho.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/Scully/scully_spoon_pho.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/Scully/scully_spoon_pho.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/UltraRingCase/ultra_ringcase.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/UltraRingCase/ultra_ringcase.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/UltraRingCase/ultra_ringcase.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/UltraRingCase/ultra_ringcase.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/UltraRingCase/ultra_ringcase.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/UltraRingCase/ultra_ringcase.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/UltraRingCase/ultra_ringcase.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/UltraRingCase/ultra_ringcase.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag1.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag1.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag1.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag1.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag2.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag2.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag2.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag2.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag3.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag3.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag3.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag3.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag4.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag4.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag4.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag4.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag5.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag5.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag5.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag5.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag6.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag6.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag6.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag6.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag7.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag7.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag7.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag7.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag8.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag8.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag8.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag8.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag9.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag9.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/lilprideflag9.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/lilprideflag9.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/p_amb_brolly_01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/p_amb_brolly_01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/p_amb_brolly_01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/p_amb_brolly_01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/p_cs_clipboard.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/p_cs_clipboard.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/p_cs_clipboard.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/p_cs_clipboard.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/pride_sign_01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/pride_sign_01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/pride_sign_01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/pride_sign_01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag1.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag1.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag1.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag1.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag2.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag2.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag2.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag2.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag3.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag3.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag3.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag3.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag4.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag4.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag4.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag4.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag5.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag5.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag5.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag5.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag6.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag6.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag6.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag6.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag7.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag7.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag7.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag7.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag8.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag8.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag8.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag8.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag9.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag9.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prideflag9.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prideflag9.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_cop_badge+hidr.ytd b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_cop_badge+hidr.ytd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_cop_badge+hidr.ytd rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_cop_badge+hidr.ytd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_cop_badge.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_cop_badge.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_cop_badge.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_cop_badge.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_lspd_badge+hidr.ytd b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_lspd_badge+hidr.ytd similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_lspd_badge+hidr.ytd rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_lspd_badge+hidr.ytd diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_lspd_badge.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_lspd_badge.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_lspd_badge.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_lspd_badge.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_rpemotesreborn_guitar_001.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_rpemotesreborn_guitar_001.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_rpemotesreborn_guitar_001.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_rpemotesreborn_guitar_001.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_rpemotesreborn_guitar_002.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_rpemotesreborn_guitar_002.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/prop_rpemotesreborn_guitar_002.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/prop_rpemotesreborn_guitar_002.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_props.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_props.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_props.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_props.ytyp diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_skateboard01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_skateboard01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_skateboard01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_skateboard01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_skateboard02.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_skateboard02.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_skateboard02.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_skateboard02.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_soda01.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_soda01.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_soda01.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_soda01.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_soda02.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_soda02.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_soda02.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_soda02.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_soda03.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_soda03.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_soda03.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_soda03.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_soda04.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_soda04.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/rpemotesreborn/rpemotesreborn_soda04.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/rpemotesreborn/rpemotesreborn_soda04.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/vedere/scarymask1.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/vedere/scarymask1.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/vedere/scarymask1.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/vedere/scarymask1.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/vedere/scarymask2.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/vedere/scarymask2.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/vedere/scarymask2.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/vedere/scarymask2.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/vedere/scarymask3.ydr b/resources/[standalone]/rpemotes-reborn/stream/[Props]/vedere/scarymask3.ydr similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/vedere/scarymask3.ydr rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/vedere/scarymask3.ydr diff --git a/resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/vedere/vedere_props.ytyp b/resources/[standalone]/rpemotes-reborn/stream/[Props]/vedere/vedere_props.ytyp similarity index 100% rename from resources/[standalone]/rpemotes-reborn-1.8.5/stream/[Props]/vedere/vedere_props.ytyp rename to resources/[standalone]/rpemotes-reborn/stream/[Props]/vedere/vedere_props.ytyp