release 2.4.1

ToniMacaroni · ToniMacaroni · commit 62aae3c245ec · 2021-12-25T23:38:14.000+01:00
diff --git a/SaberFactory/Game/EventPlayer.cs b/SaberFactory/Game/EventPlayer.cs
@@ -19,7 +19,7 @@ internal class EventPlayer : IDisposable
 
         [Inject] private readonly GameEnergyCounter _energyCounter = null;
 
-        [InjectOptional] private ObstacleSaberSparkleEffectManager _obstacleSaberSparkleEffectManager;
+        //[InjectOptional] private ObstacleSaberSparkleEffectManager _obstacleSaberSparkleEffectManager;
 
         [Inject] private readonly PluginConfig _pluginConfig = null;
 
@@ -40,8 +40,8 @@ public void Dispose()
                 _beatmapObjectManager.noteWasCutEvent -= OnNoteCut;
                 _beatmapObjectManager.noteWasMissedEvent -= OnNoteMiss;
 
-                _obstacleSaberSparkleEffectManager.sparkleEffectDidStartEvent -= SaberStartCollide;
-                _obstacleSaberSparkleEffectManager.sparkleEffectDidEndEvent -= SaberEndCollide;
+                //_obstacleSaberSparkleEffectManager.sparkleEffectDidStartEvent -= SaberStartCollide;
+                //_obstacleSaberSparkleEffectManager.sparkleEffectDidEndEvent -= SaberEndCollide;
 
                 _energyCounter.gameEnergyDidReach0Event -= InvokeOnLevelFail;
 
@@ -68,12 +68,12 @@ public void SetPartEventList(List<PartEvents> partEventsList, SaberType saberTyp
             _beatmapObjectManager.noteWasMissedEvent += OnNoteMiss;
 
             // Sabers clashing
-            if (_obstacleSaberSparkleEffectManager == null)
-            {
-                _obstacleSaberSparkleEffectManager = _monoKernel.GetComponentInChildren<ObstacleSaberSparkleEffectManager>();
-            }
-            _obstacleSaberSparkleEffectManager.sparkleEffectDidStartEvent += SaberStartCollide;
-            _obstacleSaberSparkleEffectManager.sparkleEffectDidEndEvent += SaberEndCollide;
+            //if (_obstacleSaberSparkleEffectManager == null)
+            //{
+            //    _obstacleSaberSparkleEffectManager = _monoKernel.GetComponentInChildren<ObstacleSaberSparkleEffectManager>();
+            //}
+            //_obstacleSaberSparkleEffectManager.sparkleEffectDidStartEvent += SaberStartCollide;
+            //_obstacleSaberSparkleEffectManager.sparkleEffectDidEndEvent += SaberEndCollide;
 
             // OnLevelFail
             _energyCounter.gameEnergyDidReach0Event += InvokeOnLevelFail;
diff --git a/SaberFactory/Instances/MaterialDescriptor.cs b/SaberFactory/Instances/MaterialDescriptor.cs
@@ -27,11 +27,11 @@ public virtual void Revert()
                 return;
             }
 
-            DestroyUsedMaterial();
+            DestroyCurrentMaterial();
             Material = new Material(_originalMaterial);
         }
 
-        public void DestroyUsedMaterial()
+        public void DestroyCurrentMaterial()
         {
             Material.TryDestoryImmediate();
         }
@@ -41,10 +41,15 @@ public void DestroyBackupMaterial()
             _originalMaterial.TryDestoryImmediate();
         }
 
-        public void DestroyMaterials()
+        public void Destroy()
         {
-            DestroyUsedMaterial();
+            DestroyCurrentMaterial();
             DestroyBackupMaterial();
         }
+
+        public MaterialDescriptor CreateCopy()
+        {
+            return new MaterialDescriptor(new Material(Material));
+        }
     }
 }
diff --git a/SaberFactory/Instances/RendererMaterialDescriptor.cs b/SaberFactory/Instances/RendererMaterialDescriptor.cs
@@ -20,7 +20,7 @@ public RendererMaterialDescriptor(Material material, Renderer renderer, int mate
 
         public void Dispose()
         {
-            DestroyMaterials();
+            Destroy();
         }
 
         public override void Revert()
diff --git a/SaberFactory/Models/SaberModel.cs b/SaberFactory/Models/SaberModel.cs
@@ -47,7 +47,7 @@ public async Task FromJson(JObject obj, Serializer serializer)
                     }
 
                     PieceCollection.AddPiece(piece.AssetTypeDefinition, piece.GetPiece(SaberSlot));
-                    await piece.GetLeft()?.FromJson((JObject)pieceTkn, serializer);
+                    await piece.GetPiece(SaberSlot)?.FromJson((JObject)pieceTkn, serializer);
                 }
             }
         }
diff --git a/SaberFactory/Models/TrailModel.cs b/SaberFactory/Models/TrailModel.cs
@@ -98,7 +98,7 @@ public void CopyFrom(TrailModel other)
             Width = other.Width;
             Length = other.Length;
             Material ??= new MaterialDescriptor(null);
-            Material.Material = other.Material.Material;
+            Material.Material = new Material(other.Material.Material);
             Whitestep = other.Whitestep;
             TrailOrigin = other.TrailOrigin;
             ClampTexture = other.ClampTexture;
diff --git a/SaberFactory/Plugin.cs b/SaberFactory/Plugin.cs
@@ -38,7 +38,7 @@ public async void Init(IPALogger logger, Config conf, Zenjector zenjector, Plugi
 
             zenjector.UseLogger(logger);
             zenjector.UseHttpService();
-            zenjector.Expose<ObstacleSaberSparkleEffectManager>("Gameplay");
+            //zenjector.Expose<ObstacleSaberSparkleEffectManager>("Gameplay");
             zenjector.Install<PluginAppInstaller>(Location.App, logger, pluginConfig, metadata);
             zenjector.Install<PluginMenuInstaller>(Location.Menu);
             zenjector.Install<PluginGameInstaller>(Location.Player | Location.MultiPlayer);
diff --git a/SaberFactory/manifest.json b/SaberFactory/manifest.json
@@ -3,12 +3,12 @@
   "id": "SaberFactory",
   "name": "Saber Factory",
   "author": "Toni Macaroni",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "A highly customizable saber mod",
   "gameVersion": "1.19.0",
   "dependsOn": {
     "BSIPA": "^4.2.0",
-    "SiraUtil": "^3.0.0",
+    "SiraUtil": "^3.0.1",
     "BeatSaberMarkupLanguage": "^1.5.4"
   }
 }
diff --git a/changelog.md b/changelog.md
@@ -1,11 +1,11 @@
-*(for Beat Saber 1.18.1)*
+*(for Beat Saber 1.19)*
 
-- [Alpha] [Patreon] Added new modifier tab (edit components, visibility of parts and position/scale of transforms on the saber)
+- [Alpha] [Patreon] Added new modifier tab (edit visibility of parts and position/scale of transforms on the saber)
 - Added option to automatically reload the saber when the file changes (`ReloadOnSaberUpdate` in config)
 - Added option to modify saber length (added by @9cxndy)
 - Moved .meta and .trail files to seperate folder (`UserData\Saber Factory\Cache`) to not fill up the CustomSabers folder
 - Added `_UserColorLeft` and `_UserColorRight` global shader variables that will be assigned to left saber/right saber color
-- Fixed compatibility issues with mods that bind `PluginMetadata`
+- Fixed trail reverting in some instances
 - Fixed particle systems sometimes hiding behind ui
 - Many internal code changes
 

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ public virtual void Revert()`
`27`	`27`	`return;`
`28`	`28`	`}`
`29`	`29`
`30`		`- DestroyUsedMaterial();`
	`30`	`+ DestroyCurrentMaterial();`
`31`	`31`	`Material = new Material(_originalMaterial);`
`32`	`32`	`}`
`33`	`33`
`34`		`- public void DestroyUsedMaterial()`
	`34`	`+ public void DestroyCurrentMaterial()`
`35`	`35`	`{`
`36`	`36`	`Material.TryDestoryImmediate();`
`37`	`37`	`}`
`@@ -41,10 +41,15 @@ public void DestroyBackupMaterial()`
`41`	`41`	`_originalMaterial.TryDestoryImmediate();`
`42`	`42`	`}`
`43`	`43`
`44`		`- public void DestroyMaterials()`
	`44`	`+ public void Destroy()`
`45`	`45`	`{`
`46`		`- DestroyUsedMaterial();`
	`46`	`+ DestroyCurrentMaterial();`
`47`	`47`	`DestroyBackupMaterial();`
`48`	`48`	`}`
	`49`	`+`
	`50`	`+ public MaterialDescriptor CreateCopy()`
	`51`	`+ {`
	`52`	`+ return new MaterialDescriptor(new Material(Material));`
	`53`	`+ }`
`49`	`54`	`}`
`50`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public RendererMaterialDescriptor(Material material, Renderer renderer, int mate`
`20`	`20`
`21`	`21`	`public void Dispose()`
`22`	`22`	`{`
`23`		`- DestroyMaterials();`
	`23`	`+ Destroy();`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public override void Revert()`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public async Task FromJson(JObject obj, Serializer serializer)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`PieceCollection.AddPiece(piece.AssetTypeDefinition, piece.GetPiece(SaberSlot));`
`50`		`- await piece.GetLeft()?.FromJson((JObject)pieceTkn, serializer);`
	`50`	`+ await piece.GetPiece(SaberSlot)?.FromJson((JObject)pieceTkn, serializer);`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`