From 6eed6642f4b2bdb255b3536d8189e4774fe48bd6 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Mon, 17 Jun 2024 13:32:11 -0700 Subject: [PATCH] Revert "PathToUrl" This reverts commit 396adcdbc6b5a770ffb3a69a8a8991368e8a305a. --- NewHorizons/Utility/Files/AudioUtilities.cs | 4 ++-- .../Utility/Files/SlideReelAsyncImageLoader.cs | 2 +- NewHorizons/Utility/NewHorizonExtensions.cs | 14 -------------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/NewHorizons/Utility/Files/AudioUtilities.cs b/NewHorizons/Utility/Files/AudioUtilities.cs index 008145a6..ca01b44a 100644 --- a/NewHorizons/Utility/Files/AudioUtilities.cs +++ b/NewHorizons/Utility/Files/AudioUtilities.cs @@ -108,7 +108,7 @@ namespace NewHorizons.Utility.Files { DownloadHandlerAudioClip dh = new DownloadHandlerAudioClip(path, UnityEngine.AudioType.MPEG); dh.compressed = true; - using (UnityWebRequest www = new UnityWebRequest(path.PathToUrl(), "GET", dh, null)) + using (UnityWebRequest www = new UnityWebRequest(path, "GET", dh, null)) { var result = www.SendWebRequest(); @@ -127,7 +127,7 @@ namespace NewHorizons.Utility.Files } else { - using (UnityWebRequest www = UnityWebRequestMultimedia.GetAudioClip(path.PathToUrl(), audioType)) + using (UnityWebRequest www = UnityWebRequestMultimedia.GetAudioClip(path, audioType)) { var result = www.SendWebRequest(); diff --git a/NewHorizons/Utility/Files/SlideReelAsyncImageLoader.cs b/NewHorizons/Utility/Files/SlideReelAsyncImageLoader.cs index acf5d92e..b9a8c152 100644 --- a/NewHorizons/Utility/Files/SlideReelAsyncImageLoader.cs +++ b/NewHorizons/Utility/Files/SlideReelAsyncImageLoader.cs @@ -83,7 +83,7 @@ public class SlideReelAsyncImageLoader yield break; } - using UnityWebRequest uwr = UnityWebRequestTexture.GetTexture(url.PathToUrl()); + using UnityWebRequest uwr = UnityWebRequestTexture.GetTexture(url); yield return uwr.SendWebRequest(); diff --git a/NewHorizons/Utility/NewHorizonExtensions.cs b/NewHorizons/Utility/NewHorizonExtensions.cs index c3faf81c..e11609f3 100644 --- a/NewHorizons/Utility/NewHorizonExtensions.cs +++ b/NewHorizons/Utility/NewHorizonExtensions.cs @@ -1,4 +1,3 @@ -using HarmonyLib; using NewHorizons.External.Configs; using NewHorizons.External.Modules.VariableSize; using NewHorizons.External.SerializableData; @@ -16,7 +15,6 @@ using System.Text; using System.Text.RegularExpressions; using System.Xml; using UnityEngine; -using UnityEngine.Networking; using static NewHorizons.External.Modules.ParticleFieldModule; using NomaiCoordinates = NewHorizons.External.Configs.StarSystemConfig.NomaiCoordinates; @@ -427,17 +425,5 @@ namespace NewHorizons.Utility playerCameraEffectController._owCamera.postProcessingSettings.bloom.threshold = 0f; playerCameraEffectController._owCamera.postProcessingSettings.eyeMaskEnabled = true; } - - /// - /// unity is STUPID and makes us use UnityWebRequest stuff. - /// so we have to do this to let it work with special characters. - /// - public static string PathToUrl(this string url) => - $"file:///{url - .Replace('\\', '/') - .Split('/') - .Select(UnityWebRequest.EscapeURL) - .Join(delimiter: "/") - }"; } }