From e825882fd191b46a38fcac7999aa780ed361f02d Mon Sep 17 00:00:00 2001
From: JohnCorby <williamforgames6@gmail.com>
Date: Thu, 13 Feb 2025 13:40:43 -0800
Subject: [PATCH 1/2] use direct cast so exception is cast exception instead of
 nre

---
 .../Components/EOTE/NHSlideCollectionContainer.cs  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/NewHorizons/Components/EOTE/NHSlideCollectionContainer.cs b/NewHorizons/Components/EOTE/NHSlideCollectionContainer.cs
index 5fded2a3..444d22da 100644
--- a/NewHorizons/Components/EOTE/NHSlideCollectionContainer.cs
+++ b/NewHorizons/Components/EOTE/NHSlideCollectionContainer.cs
@@ -71,7 +71,7 @@ public class NHSlideCollectionContainer : SlideCollectionContainer
     {
         if (__instance is NHSlideCollectionContainer container && container.doAsyncLoading)
         {
-            __result = (container.slideCollection as NHSlideCollection).IsSlideLoaded(container.slideIndex + 1);
+            __result = ((NHSlideCollection)container.slideCollection).IsSlideLoaded(container.slideIndex + 1);
             return false;
         }
         else
@@ -87,7 +87,7 @@ public class NHSlideCollectionContainer : SlideCollectionContainer
     {
         if (__instance is NHSlideCollectionContainer container && container.doAsyncLoading)
         {
-            __result = (container.slideCollection as NHSlideCollection).IsSlideLoaded(container.slideIndex - 1);
+            __result = ((NHSlideCollection)container.slideCollection).IsSlideLoaded(container.slideIndex - 1);
             return false;
         }
         else
@@ -102,9 +102,9 @@ public class NHSlideCollectionContainer : SlideCollectionContainer
     {
         if (__instance is NHSlideCollectionContainer container && container.doAsyncLoading)
         {
-            for (int i = 0; i < (container.slideCollection as NHSlideCollection).slidePaths.Length; i++)
+            for (int i = 0; i < ((NHSlideCollection)container.slideCollection).slidePaths.Length; i++)
             {
-                (container.slideCollection as NHSlideCollection).UnloadSlide(i);
+                ((NHSlideCollection)container.slideCollection).UnloadSlide(i);
             }
             return false;
         }
@@ -120,7 +120,7 @@ public class NHSlideCollectionContainer : SlideCollectionContainer
     {
         if (__instance is NHSlideCollectionContainer container && container.doAsyncLoading)
         {
-            __result = (container.slideCollection as NHSlideCollection).LoadSlide(id);
+            __result = ((NHSlideCollection)container.slideCollection).LoadSlide(id);
             return false;
         }
         else
@@ -135,7 +135,7 @@ public class NHSlideCollectionContainer : SlideCollectionContainer
     {
         if (__instance is NHSlideCollectionContainer container && container.doAsyncLoading)
         {
-            (container.slideCollection as NHSlideCollection).LoadSlide(__instance._currentSlideIndex);
+            ((NHSlideCollection)container.slideCollection).LoadSlide(__instance._currentSlideIndex);
             return false;
         }
         else
@@ -150,7 +150,7 @@ public class NHSlideCollectionContainer : SlideCollectionContainer
     {
         if (__instance is NHSlideCollectionContainer container && container.doAsyncLoading)
         {
-            __result = (container.slideCollection as NHSlideCollection).slidePaths != null && (container.slideCollection as NHSlideCollection).slidePaths.Any();
+            __result = ((NHSlideCollection)container.slideCollection).slidePaths != null && ((NHSlideCollection)container.slideCollection).slidePaths.Any();
             return false;
         }
         else

From b1e64c1491ba6a706af3c6e4cc557fb1c1ac41b6 Mon Sep 17 00:00:00 2001
From: JohnCorby <williamforgames6@gmail.com>
Date: Thu, 13 Feb 2025 13:54:03 -0800
Subject: [PATCH 2/2] dont need to check CacheExists

---
 NewHorizons/Builder/Props/ProjectionBuilder.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NewHorizons/Builder/Props/ProjectionBuilder.cs b/NewHorizons/Builder/Props/ProjectionBuilder.cs
index 1532fbe1..54141a30 100644
--- a/NewHorizons/Builder/Props/ProjectionBuilder.cs
+++ b/NewHorizons/Builder/Props/ProjectionBuilder.cs
@@ -164,7 +164,7 @@ namespace NewHorizons.Builder.Props
 
             var key = GetUniqueSlideReelID(mod, info.slides);
 
-            if (CacheExists(mod) && atlasImageLoader != null)
+            if (atlasImageLoader != null)
             {
                 atlasImageLoader.imageLoadedEvent.AddListener(
                     (Texture2D tex, int _, string originalPath) =>
@@ -585,7 +585,6 @@ namespace NewHorizons.Builder.Props
                 {
                     atlasImageLoader.Start(false, false);
                 }
-                // When using the inverted cache we never need the regular images
                 if (useInvertedCache)
                 {
                     invertedImageLoader.Start(true, false);