Merge pull request #24 from DerpyNewbie/refactor/revert-namespace-cha…

…nges-#22 Revert namespace changes from #22
DerpyNewbie · Nov 25, 2024 · 93fc6c0 · 93fc6c0
2 parents 1c925af + b22221d
commit 93fc6c0
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 25 deletions.
diff --git a/Packages/dev.derpynewbie.common/Runtime/Line/LineDrawer.asset b/Packages/dev.derpynewbie.common/Runtime/Line/LineDrawer.asset
@@ -21,7 +21,7 @@ MonoBehaviour:
   compiledVersion: 2
   behaviourSyncMode: 1
   hasInteractEvent: 0
-  scriptID: -5307525316642168015
+  scriptID: -5767982907742393460
   serializationData:
     SerializedFormat: 2
     SerializedBytes: 

diff --git a/Packages/dev.derpynewbie.common/Runtime/Line/LineDrawer.cs b/Packages/dev.derpynewbie.common/Runtime/Line/LineDrawer.cs
@@ -2,7 +2,7 @@
 using UdonSharp;
 using UnityEngine;
 
-namespace DerpyNewbie.Common.Line
+namespace DerpyNewbie.Common
 {
     /// <summary>
     /// Draws a line with provided values.

diff --git a/Packages/dev.derpynewbie.common/Runtime/Line/LineManager.asset b/Packages/dev.derpynewbie.common/Runtime/Line/LineManager.asset
@@ -21,7 +21,7 @@ MonoBehaviour:
   compiledVersion: 2
   behaviourSyncMode: 1
   hasInteractEvent: 0
-  scriptID: 2626197779801845186
+  scriptID: -2305655732687220745
   serializationData:
     SerializedFormat: 2
     SerializedBytes: 

diff --git a/Packages/dev.derpynewbie.common/Runtime/Line/LineManager.cs b/Packages/dev.derpynewbie.common/Runtime/Line/LineManager.cs
@@ -2,7 +2,7 @@
 using UdonSharp;
 using UnityEngine;
 
-namespace DerpyNewbie.Common.Line
+namespace DerpyNewbie.Common
 {
     /// <summary>
     /// Useful line drawing manager for debug visualization purposes.

diff --git a/Packages/dev.derpynewbie.common/Runtime/Mirror/MirrorHandler.asset b/Packages/dev.derpynewbie.common/Runtime/Mirror/MirrorHandler.asset
@@ -21,7 +21,7 @@ MonoBehaviour:
   compiledVersion: 2
   behaviourSyncMode: 1
   hasInteractEvent: 0
-  scriptID: -7659492452314693655
+  scriptID: -787544144261720692
   serializationData:
     SerializedFormat: 2
     SerializedBytes: 

diff --git a/Packages/dev.derpynewbie.common/Runtime/Mirror/MirrorHandler.cs b/Packages/dev.derpynewbie.common/Runtime/Mirror/MirrorHandler.cs
@@ -1,7 +1,7 @@
 using UdonSharp;
 using UnityEngine;
 
-namespace DerpyNewbie.Common.Mirror
+namespace DerpyNewbie.Common
 {
     [AddComponentMenu("Newbie Commons/Utils/Mirror Handler")]
     [UdonBehaviourSyncMode(BehaviourSyncMode.None)]

diff --git a/Packages/dev.derpynewbie.common/Runtime/Mirror/MirrorView.asset b/Packages/dev.derpynewbie.common/Runtime/Mirror/MirrorView.asset
@@ -21,7 +21,7 @@ MonoBehaviour:
   compiledVersion: 2
   behaviourSyncMode: 1
   hasInteractEvent: 0
-  scriptID: -3046695921911116002
+  scriptID: 8584452886529785660
   serializationData:
     SerializedFormat: 2
     SerializedBytes: 
@@ -62,7 +62,7 @@ MonoBehaviour:
       Data: 3|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: DerpyNewbie.Common.Mirror.MirrorHandler, DerpyNewbie.Common
+      Data: DerpyNewbie.Common.MirrorHandler, DerpyNewbie.Common
     - Name: 
       Entry: 8
       Data: 

diff --git a/Packages/dev.derpynewbie.common/Runtime/Mirror/MirrorView.cs b/Packages/dev.derpynewbie.common/Runtime/Mirror/MirrorView.cs
@@ -1,7 +1,7 @@
 using UdonSharp;
 using UnityEngine;
 
-namespace DerpyNewbie.Common.Mirror
+namespace DerpyNewbie.Common
 {
     [AddComponentMenu("Newbie Commons/Utils/Mirror View")]
     [UdonBehaviourSyncMode(BehaviourSyncMode.None)]

diff --git a/Packages/dev.derpynewbie.common/Runtime/PickupReferenceChanger.asset b/Packages/dev.derpynewbie.common/Runtime/PickupReferenceChanger.asset
@@ -44,25 +44,25 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 12
-      Data: 3
+      Data: 4
     - Name: 
       Entry: 7
       Data: 
     - Name: $k
       Entry: 1
-      Data: pickupReference
+      Data: pickup
     - Name: $v
       Entry: 7
       Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: pickupReference
+      Data: pickup
     - Name: <UserType>k__BackingField
       Entry: 7
       Data: 3|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: UnityEngine.Transform, UnityEngine.CoreModule
+      Data: VRC.SDK3.Components.VRCPickup, VRCSDK3
     - Name: 
       Entry: 8
       Data: 
@@ -110,19 +110,79 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: leftHandReference
+      Data: pickupReference
     - Name: $v
       Entry: 7
       Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: pickupReference
+    - Name: <UserType>k__BackingField
+      Entry: 7
+      Data: 7|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: UnityEngine.Transform, UnityEngine.CoreModule
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 7
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: true
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 9|UnityEngine.SerializeField, UnityEngine.CoreModule
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: leftHandReference
+    - Name: $v
+      Entry: 7
+      Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: leftHandReference
     - Name: <UserType>k__BackingField
       Entry: 9
-      Data: 3
+      Data: 7
     - Name: <SystemType>k__BackingField
       Entry: 9
-      Data: 3
+      Data: 7
     - Name: <SyncMode>k__BackingField
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -137,13 +197,13 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 7|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 7
-      Data: 8|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 12|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 
@@ -167,16 +227,16 @@ MonoBehaviour:
       Data: rightHandReference
     - Name: $v
       Entry: 7
-      Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: rightHandReference
     - Name: <UserType>k__BackingField
       Entry: 9
-      Data: 3
+      Data: 7
     - Name: <SystemType>k__BackingField
       Entry: 9
-      Data: 3
+      Data: 7
     - Name: <SyncMode>k__BackingField
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -191,13 +251,13 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 7
-      Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 

diff --git a/Packages/dev.derpynewbie.common/Samples/Scenes/NewbieCommonsSample.unity b/Packages/dev.derpynewbie.common/Samples/Scenes/NewbieCommonsSample.unity
@@ -829,7 +829,7 @@ MonoBehaviour:
   SynchronizePosition: 0
   AllowCollisionOwnershipTransfer: 0
   Reliable: 0
-  _syncMethod: 0
+  _syncMethod: 1
   serializedProgramAsset: {fileID: 11400000, guid: 0c48745eca46aff41bd36805fc8f956c,
     type: 2}
   programSource: {fileID: 11400000, guid: 3ff259a302ce43648a2ecdf049ebc905, type: 2}
@@ -1626,7 +1626,7 @@ MonoBehaviour:
   SynchronizePosition: 0
   AllowCollisionOwnershipTransfer: 0
   Reliable: 0
-  _syncMethod: 0
+  _syncMethod: 1
   serializedProgramAsset: {fileID: 11400000, guid: be5ca84ef694dc440bb53c88061df21b,
     type: 2}
   programSource: {fileID: 11400000, guid: 9c8f93bfabc65dd4d94db1952a1e9523, type: 2}
@@ -2475,6 +2475,7 @@ MonoBehaviour:
     SerializationNodes: []
   _udonSharpBackingUdonBehaviour: {fileID: 1026992944}
   targetProxy: {fileID: 1063894484}
+  spawnOverride: {fileID: 0}
 --- !u!65 &1026992946
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -3577,6 +3578,7 @@ MonoBehaviour:
     SerializationNodes: []
   _udonSharpBackingUdonBehaviour: {fileID: 1451897810}
   targetProxy: {fileID: 1863923291}
+  spawnOverride: {fileID: 0}
 --- !u!135 &1451897812
 SphereCollider:
   m_ObjectHideFlags: 0