Move berry sprites to Graphics/Sprites.xml to make them reskinnable

Author: maddie480

CollabModule.cs

@@ -87,10 +87,6 @@ private void onModAssetUpdate(ModAsset oldAsset, ModAsset newAsset) {
         }
 
         public override void LoadContent(bool firstLoad) {
-            SilverBerry.LoadContent();
-            RainbowBerry.LoadContent();
-            SpeedBerry.LoadContent();
-
             reloadCrystalHeartSwapSpriteBanks();
         }
 

Entities/HoloRainbowBerry.cs

@@ -33,8 +33,8 @@ public HoloRainbowBerry(Vector2 position, int currentBerries, int totalBerries)
             }
 
             // create the sprites, overlap them, and give them transparency.
-            sprite = RainbowBerry.SpriteBank.Create("holoRainbowBerry");
-            desaturatedSprite = RainbowBerry.SpriteBank.Create("desaturatedHoloRainbowBerry");
+            sprite = GFX.SpriteBank.Create("CollabUtils2_holoRainbowBerry");
+            desaturatedSprite = GFX.SpriteBank.Create("CollabUtils2_desaturatedHoloRainbowBerry");
 
             sprite.Color *= (transparencyProgress * saturationProgress);
             desaturatedSprite.Color *= transparencyProgress * (1 - saturationProgress);

Entities/RainbowBerry.cs

@@ -11,17 +11,11 @@ namespace Celeste.Mod.CollabUtils2.Entities {
     [CustomEntity("CollabUtils2/RainbowBerry")]
     [RegisterStrawberry(tracked: false, blocksCollection: false)]
     class RainbowBerry : Strawberry {
-        public static SpriteBank SpriteBank;
-
         private string levelSet;
 
         internal HoloRainbowBerry HologramForCutscene;
         internal int CutsceneTotalBerries;
 
-        public static void LoadContent() {
-            SpriteBank = new SpriteBank(GFX.Game, "Graphics/CollabUtils2/RainbowBerry.xml");
-        }
-
         public RainbowBerry(EntityData data, Vector2 offset, EntityID gid) : base(data, offset, gid) {
             levelSet = data.Attr("levelSet");
         }

Entities/RainbowBerryPerfectEffect.cs

@@ -9,7 +9,7 @@ public RainbowBerryPerfectEffect(Vector2 position)
 
             Sprite sprite;
             Depth = -1000000;
-            Add(sprite = RainbowBerry.SpriteBank.Create("perfectAnimation"));
+            Add(sprite = GFX.SpriteBank.Create("CollabUtils2_perfectAnimation"));
             sprite.OnLastFrame = delegate {
                 RemoveSelf();
             };

Entities/SilverBerry.cs

@@ -10,17 +10,11 @@ namespace Celeste.Mod.CollabUtils2.Entities {
     [CustomEntity("CollabUtils2/SilverBerry")]
     [RegisterStrawberry(tracked: false, blocksCollection: true)]
     class SilverBerry : Strawberry {
-        public static SpriteBank SpriteBank;
-
         private static ParticleType P_SilverGlow;
         private static ParticleType P_OrigGoldGlow;
         private static ParticleType P_SilverGhostGlow;
         private static ParticleType P_OrigGhostGlow;
 
-        public static void LoadContent() {
-            SpriteBank = new SpriteBank(GFX.Game, "Graphics/CollabUtils2/SilverBerry.xml");
-        }
-
         private bool spawnedThroughGiveSilver = false;
 
         public SilverBerry(EntityData data, Vector2 offset, EntityID gid) : base(data, offset, gid) {

Entities/SpeedBerry.cs

@@ -14,9 +14,6 @@ namespace Celeste.Mod.CollabUtils2.Entities {
     [CustomEntity("CollabUtils2/SpeedBerry")]
     [Tracked]
     public class SpeedBerry : Strawberry {
-
-        public static SpriteBank SpriteBank;
-
         public EntityData EntityData;
         public float BronzeTime;
         public float SilverTime;
@@ -64,10 +61,6 @@ private static void onTransitionEnd(On.Celeste.Player.orig_OnTransition orig, Pl
             if (speedBerry != null) {
                 speedBerry.TimerDisplay?.StartTimer();
             }
-        }
-
-        public static void LoadContent() {
-            SpriteBank = new SpriteBank(GFX.Game, "Graphics/CollabUtils2/SpeedBerry.xml");
         }
 
         public SpeedBerry(EntityData data, Vector2 offset, EntityID id, bool restored) : base(data, offset, id) {
@@ -211,7 +204,7 @@ public override void Update() {
         private static void playAnimationSpeedrunToolSafe(Sprite sprite, string animation) {
             if (sprite.Texture?.AtlasPath?.StartsWith("collectables/speedrun_tool_goldberry/") ?? false) {
                 // this means Speedrun Tool replaced the sprite, so replace it again or we are going to crash.
-                SpriteBank.CreateOn(sprite, "speedBerry");
+                GFX.SpriteBank.CreateOn(sprite, "CollabUtils2_speedBerry");
             }
             sprite.Play(animation);
         }
@@ -232,7 +225,7 @@ private void dissolve() {
 
         private class SpeedBerryExplosionAnimation : Entity {
             public SpeedBerryExplosionAnimation(Vector2 position) : base(position) {
-                Add(SpriteBank.Create("speedBerryExplosion"));
+                Add(GFX.SpriteBank.Create("CollabUtils2_speedBerryExplosion"));
                 Depth = -1000000;
             }
         }

Entities/StrawberryHooks.cs

@@ -107,21 +107,21 @@ private static void modStrawberrySprite(ILContext il) {
                     // this method determines the strawberry sprite. "orig" is the original sprite, "self" is the strawberry.
                     if (self is SilverBerry) {
                         if (SaveData.Instance.CheckStrawberry(self.ID)) {
-                            return SilverBerry.SpriteBank.Create("ghostSilverBerry");
+                            return GFX.SpriteBank.Create("CollabUtils2_ghostSilverBerry");
                         }
-                        return SilverBerry.SpriteBank.Create("silverBerry");
+                        return GFX.SpriteBank.Create("CollabUtils2_silverBerry");
                     }
                     if (self is RainbowBerry) {
                         if (SaveData.Instance.CheckStrawberry(self.ID)) {
-                            return RainbowBerry.SpriteBank.Create("ghostRainbowBerry");
+                            return GFX.SpriteBank.Create("CollabUtils2_ghostRainbowBerry");
                         }
-                        return RainbowBerry.SpriteBank.Create("rainbowBerry");
+                        return GFX.SpriteBank.Create("CollabUtils2_rainbowBerry");
                     }
                     if (self is SpeedBerry) {
                         if (SaveData.Instance.CheckStrawberry(self.ID)) {
-                            return SpeedBerry.SpriteBank.Create("ghostSpeedBerry");
+                            return GFX.SpriteBank.Create("CollabUtils2_ghostSpeedBerry");
                         }
-                        return SpeedBerry.SpriteBank.Create("speedBerry");
+                        return GFX.SpriteBank.Create("CollabUtils2_speedBerry");
                     }
                     return orig;
                 });