Update miscellaneous files

CoreKeeperMods · Jun 21, 2024 · 927978c · 927978c
1 parent aafb039
commit 927978c
Show file tree

Hide file tree

Showing 17 changed files with 157 additions and 51 deletions.
diff --git a/Assets/Metadata/CoreLib.Commands.asset b/Assets/Metadata/CoreLib.Commands.asset
@@ -22,6 +22,7 @@ MonoBehaviour:
     requiredOn: -1
     files:
     - path: Scripts/Scripts/Util/CommandUtil.cs
+    - path: Scripts/Scripts/System/LoadItemDictSystem.cs
     - path: Scripts/Scripts/Patches/TitleScreenAnimator_Patch.cs
     - path: Scripts/Scripts/Patches/MenuManager_Patch.cs
     - path: Scripts/Scripts/Patches/ECSManager_Patch.cs

diff --git a/Assets/Metadata/CoreLib.Entity.asset b/Assets/Metadata/CoreLib.Entity.asset
@@ -20,7 +20,30 @@ MonoBehaviour:
     accessesExtraAssemblies: 1
     disableHarmonyPatching: 0
     requiredOn: -1
-    files: []
+    files:
+    - path: Localization/Localization.csv
+    - path: Scripts/Scripts/WorkbenchDefinition.cs
+    - path: Scripts/Scripts/PrefabCrawler.cs
+    - path: Scripts/Scripts/Patches/PlayerController_Patch.cs
+    - path: Scripts/Scripts/Patches/MemoryManager_Patch.cs
+    - path: Scripts/Scripts/Patches/GraphicalObjectConversion_Patch.cs
+    - path: Scripts/Scripts/Patches/ColorReplacer_Patch.cs
+    - path: Scripts/Scripts/MonoBehaviourUtils.cs
+    - path: Scripts/Scripts/Interfaces/IDynamicItemHandler.cs
+    - path: Scripts/Scripts/EntityModule.cs
+    - path: Scripts/Scripts/CraftingData.cs
+    - path: Scripts/Scripts/Components/TemplateObject.cs
+    - path: Scripts/Scripts/Components/SupportsPooling.cs
+    - path: Scripts/Scripts/Components/RuntimeMaterial.cs
+    - path: Scripts/Scripts/Components/PoolSettings.cs
+    - path: Scripts/Scripts/Components/ModWorkbenchBuilding.cs
+    - path: Scripts/Scripts/Components/ModCraftingAuthoring.cs
+    - path: Scripts/Scripts/Components/ModCDAuthoringBase.cs
+    - path: Scripts/Scripts/Components/EntityPrefabOverride.cs
+    - path: Scripts/Scripts/Atributes/PrefabModificationAttribute.cs
+    - path: Scripts/Scripts/Atributes/EntityModificationAttribute.cs
+    - path: Bundles/CoreLib.Entity_Windows.assetbundle
+    - path: Bundles/CoreLib.Entity_Linux.assetbundle
     dependencies:
     - modName: CoreLib
       required: 1

diff --git a/Assets/Metadata/CoreLib.Equipment.asset b/Assets/Metadata/CoreLib.Equipment.asset
@@ -16,6 +16,7 @@ MonoBehaviour:
     guid: d7b9e43dd003478d8eefe742315dfddb
     name: CoreLib.Equipment
     skipSafetyChecks: 0
+    disableScripts: 0
     accessesExtraAssemblies: 1
     disableHarmonyPatching: 0
     requiredOn: 0

diff --git a/Assets/Resources/SpriteAssetManifest.asset b/Assets/Resources/SpriteAssetManifest.asset
@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: SpriteAssetManifest
   m_EditorClassIdentifier: 
   spriteAssets:
-  - {fileID: 11400000, guid: b05d94f23f54e82429431780ad02a96e, type: 2}
-  - {fileID: 11400000, guid: 18ee6ee5463d288409e5abde9e80fc0e, type: 2}
+  - {fileID: 11400000, guid: 9e5aa8becaff59e40b5758e408e72387, type: 2}
+  - {fileID: 11400000, guid: d6d36324533a3a14092a17ce22ea322a, type: 2}
   gradientMaps: []
   transformAnimations: []
diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset
@@ -12,7 +12,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3}
   m_Name: UniversalRenderPipelineGlobalSettings
   m_EditorClassIdentifier: 
-  k_AssetVersion: 2
+  k_AssetVersion: 3
+  m_RenderingLayerNames:
+  - Light Layer default
+  - Light Layer 1
+  - Light Layer 2
+  - Light Layer 3
+  - Light Layer 4
+  - Light Layer 5
+  - Light Layer 6
+  - Light Layer 7
+  m_ValidRenderingLayers: 255
   lightLayerName0: Light Layer default
   lightLayerName1: Light Layer 1
   lightLayerName2: Light Layer 2
@@ -24,4 +34,8 @@ MonoBehaviour:
   m_StripDebugVariants: 1
   m_StripUnusedPostProcessingVariants: 0
   m_StripUnusedVariants: 1
+  m_StripUnusedLODCrossFadeVariants: 1
+  m_StripScreenCoordOverrideVariants: 1
   supportRuntimeDebugDisplay: 0
+  m_ShaderVariantLogLevel: 0
+  m_ExportShaderVariants: 1
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,17 +1,17 @@
 {
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.addressables": "1.21.17",
-    "com.unity.ai.navigation": "1.1.4",
-    "com.unity.burst": "1.8.9",
+    "com.unity.addressables": "1.21.19",
+    "com.unity.ai.navigation": "1.1.5",
+    "com.unity.burst": "1.8.12",
     "com.unity.editorcoroutines": "1.0.0",
-    "com.unity.ide.rider": "3.0.24",
-    "com.unity.ide.visualstudio": "2.0.18",
+    "com.unity.ide.rider": "3.0.27",
+    "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.netcode": "1.0.15",
     "com.unity.physics": "1.0.14",
-    "com.unity.postprocessing": "3.2.2",
-    "com.unity.render-pipelines.universal": "14.0.8",
+    "com.unity.postprocessing": "3.4.0",
+    "com.unity.render-pipelines.universal": "14.0.10",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.5",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -7,11 +7,11 @@
       "dependencies": {}
     },
     "com.unity.addressables": {
-      "version": "1.21.17",
+      "version": "1.21.19",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.scriptablebuildpipeline": "1.21.9",
+        "com.unity.scriptablebuildpipeline": "1.21.21",
         "com.unity.modules.assetbundle": "1.0.0",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
@@ -21,7 +21,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ai.navigation": {
-      "version": "1.1.4",
+      "version": "1.1.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -30,11 +30,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.8.9",
+      "version": "1.8.12",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -82,7 +83,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.24",
+      "version": "3.0.27",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -91,7 +92,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.18",
+      "version": "2.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -156,7 +157,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.postprocessing": {
-      "version": "3.2.2",
+      "version": "3.4.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -172,7 +173,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "14.0.8",
+      "version": "14.0.10",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
@@ -183,18 +184,27 @@
       }
     },
     "com.unity.render-pipelines.universal": {
-      "version": "14.0.8",
+      "version": "14.0.10",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
         "com.unity.mathematics": "1.2.1",
-        "com.unity.burst": "1.8.4",
-        "com.unity.render-pipelines.core": "14.0.8",
-        "com.unity.shadergraph": "14.0.8"
+        "com.unity.burst": "1.8.9",
+        "com.unity.render-pipelines.core": "14.0.10",
+        "com.unity.shadergraph": "14.0.10",
+        "com.unity.render-pipelines.universal-config": "14.0.9"
+      }
+    },
+    "com.unity.render-pipelines.universal-config": {
+      "version": "14.0.9",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.render-pipelines.core": "14.0.9"
       }
     },
     "com.unity.scriptablebuildpipeline": {
-      "version": "1.21.9",
+      "version": "1.21.21",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -218,11 +228,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "14.0.8",
+      "version": "14.0.10",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.8",
+        "com.unity.render-pipelines.core": "14.0.10",
         "com.unity.searcher": "4.9.2"
       }
     },

diff --git a/ProjectSettings/BurstAotSettings_StandaloneLinux64.json b/ProjectSettings/BurstAotSettings_StandaloneLinux64.json
@@ -0,0 +1,17 @@
+{
+  "MonoBehaviour": {
+    "Version": 4,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "DebugDataKind": 1,
+    "EnableArmv9SecurityFeatures": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0,
+    "CpuTargetsX64": 72,
+    "OptimizeFor": 0
+  }
+}
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
@@ -4,10 +4,7 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes:
-  - enabled: 0
-    path: 
-    guid: 00000000000000000000000000000000
+  m_Scenes: []
   m_configObjects:
-    com.unity.addressableassets: {fileID: 11400000, guid: 62ffbfedd75f9de478b526bb3275f780,
+    com.unity.addressableassets: {fileID: 11400000, guid: 2796915a788811d42a46010e4bca64b5,
       type: 2}
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 14
+  serializedVersion: 15
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -13,9 +13,6 @@ GraphicsSettings:
   m_ScreenSpaceShadows:
     m_Mode: 1
     m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
-  m_LegacyDeferred:
-    m_Mode: 1
-    m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
   m_DepthNormals:
     m_Mode: 1
     m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
@@ -41,7 +38,8 @@ GraphicsSettings:
   m_PreloadShadersBatchTimeLimit: -1
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
-  m_CustomRenderPipeline: {fileID: 0}
+  m_CustomRenderPipeline: {fileID: 11400000, guid: b004f3effcb17704799484dedc9e52f9,
+    type: 2}
   m_TransparencySortMode: 0
   m_TransparencySortAxis: {x: 0, y: 0, z: 1}
   m_DefaultRenderingPath: 1
@@ -50,6 +48,7 @@ GraphicsSettings:
   m_LightmapStripping: 0
   m_FogStripping: 0
   m_InstancingStripping: 0
+  m_BrgStripping: 0
   m_LightmapKeepPlain: 1
   m_LightmapKeepDirCombined: 1
   m_LightmapKeepDynamicPlain: 1
@@ -65,5 +64,8 @@ GraphicsSettings:
   m_DefaultRenderingLayerMask: 1
   m_LogWhenShaderIsCompiled: 0
   m_SRPDefaultSettings:
-    UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 33f0306306c95e34c96ec23540a926e8,
+    UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: bc58e5daa4d693d4f96d8d679cfe07f4,
       type: 2}
+  m_LightProbeOutsideHullStrategy: 0
+  m_CameraRelativeLightCulling: 0
+  m_CameraRelativeShadowCulling: 0
diff --git a/ProjectSettings/NetCodeClientAndServerSettings.asset b/ProjectSettings/NetCodeClientAndServerSettings.asset
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &1
 MonoBehaviour:
-  m_ObjectHideFlags: 53
+  m_ObjectHideFlags: 61
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}

diff --git a/ProjectSettings/NetCodeClientSettings.asset b/ProjectSettings/NetCodeClientSettings.asset
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &1
 MonoBehaviour:
-  m_ObjectHideFlags: 53
+  m_ObjectHideFlags: 61
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}

diff --git a/ProjectSettings/NetCodeServerSettings.asset b/ProjectSettings/NetCodeServerSettings.asset
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &1
 MonoBehaviour:
-  m_ObjectHideFlags: 53
+  m_ObjectHideFlags: 61
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.10f1
-m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62)
+m_EditorVersion: 2022.3.20f1
+m_EditorVersionWithRevision: 2022.3.20f1 (61c2feb0970d)