gg.easy.airship 0.1.2183 → 0.1.2185

package/Editor/AirshipComponentEditor.cs

@@ -598,6 +598,9 @@ public class ScriptBindingEditor : UnityEditor.Editor {
             case "IntEnum":
                 DrawCustomIntEnumProperty(guiContent, bindingProp, value, modified);
                 break;
+            case "FlagEnum":
+                DrawCustomFlagEnumProperty(guiContent, bindingProp, value, modified);
+                break;
             case "boolean" or "bool":
                 DrawCustomBoolProperty(guiContent, type, decorators, value, modified);
                 break;
@@ -642,6 +645,11 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                 GUILayout.Label($"{propName.stringValue}: {type.stringValue} not yet supported");
                 break;
         }
+
+        if (Application.isPlaying) {
+            var component = (AirshipComponent)target;
+            component.WriteChangedComponentProperties();
+        }
         
         if (hasOverride && Event.current.type == EventType.Repaint) {
             var lastRect = GUILayoutUtility.GetLastRect();
@@ -851,11 +859,22 @@ public class ScriptBindingEditor : UnityEditor.Editor {
             }
             case AirshipComponentPropertyType.AirshipObject: {
                 var objOld = objectRefs.arraySize > index ? objectRefs.GetArrayElementAtIndex(index).objectReferenceValue : null;
-                var objNew = EditorGUI.ObjectField(rect, label, objOld, objectType, true);
-                if (objOld != objNew) {
-                    objectRefs.GetArrayElementAtIndex(index).objectReferenceValue = objNew;
-                    arrayModified.boolValue = true;
+
+                if (objectType == typeof(Sprite) || objectType == typeof(Texture2D)) {
+                    var objNew = AirshipEditorGUI.ObjectField(rect, new GUIContent(label), objOld, objectType, true);
+                    if (objOld != objNew) {
+                        objectRefs.GetArrayElementAtIndex(index).objectReferenceValue = objNew;
+                        arrayModified.boolValue = true;
+                    }
+                } else {
+                    var objNew = EditorGUI.ObjectField(rect, label, objOld, objectType, true);
+                    if (objOld != objNew) {
+                        objectRefs.GetArrayElementAtIndex(index).objectReferenceValue = objNew;
+                        arrayModified.boolValue = true;
+                    }
                 }
+                
+
                 break;
             }
             default:
@@ -882,11 +901,11 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         {
             newValue = Math.Max(Convert.ToInt32(minParams[0].value), newValue);
         }
-        if (modifiers.TryGetValue("Max", out var maxParams))
-        {
+
+        if (modifiers.TryGetValue("Max", out var maxParams)) {
             newValue = Math.Min(Convert.ToInt32(maxParams[0].value), newValue);
         }
-        
+
         if (newValue != currentValue) {
             value.stringValue = newValue.ToString(CultureInfo.InvariantCulture);
             modified.boolValue = true;
@@ -981,7 +1000,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         
         List<GUIContent> items = new();
         foreach (var item in enumerableType.members) {
-            items.Add(new GUIContent(ObjectNames.NicifyVariableName(item.Name) + " [" + item.IntValue + "]") );
+            items.Add(new GUIContent(ObjectNames.NicifyVariableName(item.Name)) );
         }
             
         int idx = 0;
@@ -1004,6 +1023,28 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     private void DrawCustomIntEnumProperty(GUIContent guiContent, LuauMetadataProperty metadataProperty,
         SerializedProperty value, SerializedProperty modified) {
         //
+        if (!AirshipEditorInfo.Instance) {
+            EditorGUILayout.HelpBox("Cannot find editor info", MessageType.Error);
+            return;
+        }
+
+        if (metadataProperty.refPath == null) {
+            EditorGUILayout.HelpBox("Cannot find refPath", MessageType.Error);
+            return;
+        }
+        
+        var tsEnum = AirshipEditorInfo.Enums.GetEnum(metadataProperty.refPath);
+        if (tsEnum == null) {
+            EditorGUILayout.HelpBox("Cannot find enum from refPath", MessageType.Error);
+            return;
+        }
+
+        DrawCustomIntEnumDropdown(guiContent, tsEnum, value, modified, null);
+    }
+    
+    private void DrawCustomFlagEnumProperty(GUIContent guiContent, LuauMetadataProperty metadataProperty,
+        SerializedProperty value, SerializedProperty modified) {
+
         if (!AirshipEditorInfo.Instance) return;
 
         if (metadataProperty.refPath == null) {
@@ -1012,8 +1053,25 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         
         var tsEnum = AirshipEditorInfo.Enums.GetEnum(metadataProperty.refPath);
         if (tsEnum == null) return;
+        
+        int.TryParse(value.stringValue, out int currentMask);
 
-        DrawCustomIntEnumDropdown(guiContent, tsEnum, value, modified, null);
+#if AIRSHIP_INTERNAL
+        EditorGUILayout.BeginHorizontal();
+#endif
+        var newMask = EditorGUILayout.MaskField(guiContent, currentMask, tsEnum.flagNames);
+        if (newMask != currentMask) {
+            value.stringValue = newMask.ToString(CultureInfo.InvariantCulture);
+            modified.boolValue = true;
+        }
+
+#if AIRSHIP_INTERNAL
+        GUI.enabled = false;
+        EditorGUILayout.IntField(newMask, GUILayout.Width(100));
+        EditorGUILayout.Toggle("", tsEnum.isFlagLike, GUILayout.Width(30));
+        GUI.enabled = true;
+        EditorGUILayout.EndHorizontal();
+#endif
     }
     
     private void DrawCustomStringEnumProperty(GUIContent guiContent, LuauMetadataProperty metadataProperty, SerializedProperty value,
@@ -1097,11 +1155,11 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         {
             currentValue = 0;
         }
-        int newValue = EditorGUILayout.LayerField(guiContent, currentValue);
-        if (newValue != currentValue)
-        {
-            value.stringValue = newValue.ToString(CultureInfo.InvariantCulture);
-            modified.boolValue = true;
+
+        int maskValue = EditorGUILayout.MaskField(guiContent, currentValue, GameConfig.Load().gameLayers);
+        if (maskValue != currentValue) {
+            value.stringValue = maskValue.ToString(CultureInfo.InvariantCulture);
+            modified.boolValue = true;   
         }
     }
     
@@ -1225,7 +1283,13 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     private void DrawCustomObjectProperty(GUIContent guiContent, SerializedProperty type, SerializedProperty modifiers, SerializedProperty obj, SerializedProperty objType, SerializedProperty modified) {
         var currentObject = obj.objectReferenceValue;
         var t = objType.stringValue != "" ? TypeReflection.GetTypeFromString(objType.stringValue) : typeof(Object);
-        var newObject = EditorGUILayout.ObjectField(guiContent, currentObject, t, true);
+
+        UnityEngine.Object newObject;
+        if (t == typeof(Sprite) || t == typeof(Texture2D)) {
+            newObject = AirshipEditorGUI.ObjectFieldLayout(guiContent, currentObject, t, true);
+        } else {
+            newObject = EditorGUILayout.ObjectField(guiContent, currentObject, t, true);
+        }
             
         if (newObject != currentObject) {
             obj.objectReferenceValue = newObject;

package/Editor/AirshipScriptGUI.cs

@@ -1,5 +1,6 @@
 #if UNITY_EDITOR
 using System;
+using Editor.EditorInternal;
 using JetBrains.Annotations;
 using Luau;
 using UnityEditor;
@@ -187,7 +188,7 @@ namespace Code.Luau {
                         temp.image = displayIcon;
                     }
                     
-                    EditorStyles.objectField.Draw(position, temp, id, DragAndDrop.activeControlID == id,
+                    AirshipEditorGUI.nonClippingObjectField.Draw(position, temp, id, DragAndDrop.activeControlID == id,
                         position.Contains(Event.current.mousePosition));
 
 
@@ -242,6 +243,10 @@ namespace Code.Luau {
             var r = EditorGUILayout.GetControlRect(false, ObjectField.singleLineHeight);
             return AirshipBehaviourField(r, content, script, airshipComponent, null);
         }
+
+        internal static Sprite AirshipSpriteField(Rect position, GUIContent content, Sprite sprite) {
+            return (Sprite) AirshipEditorInternals.DoCustomObjectField(position, content, sprite, typeof(Sprite));
+        }
     }
 }
 #endif

package/Editor/BuildMenu.cs

@@ -78,7 +78,7 @@ namespace Editor {
                 locationPathName = $"build/StandaloneLinux64/{ServerExecutableName}",
                 options = BuildOptions.Development,
             };
-            
+
             var report = BuildPipeline.BuildPlayer(options);
             var summary = report.summary;
             switch (summary.result) {
@@ -87,12 +87,18 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.Log("Build Linux failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.Log("Build Linux unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
-            
+
             CreateAssetBundles.AddAllGameBundleScenes();
         }
 
@@ -142,9 +148,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.LogError("Build Mac failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.LogError("Build Mac unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 
@@ -181,9 +193,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.LogError("Build Mac failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.LogError("Build Mac unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 
@@ -227,9 +245,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.LogError("Build iOS failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.LogError("Build iOS unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 
@@ -284,9 +308,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.LogError("Build Android failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.LogError("Build Android unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 
@@ -371,9 +401,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.Log("Build Windows failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.Log("Build Windows unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 
@@ -407,9 +443,15 @@ namespace Editor {
                     break;
                 case BuildResult.Failed:
                     Debug.Log("Build Windows failed");
+#if GAME_CI
+                    EditorApplication.Exit(1);
+#endif
                     break;
                 default:
                     Debug.Log("Build Windows unexpected result:" + summary.result);
+#if GAME_CI
+                    EditorApplication.Exit(2);
+#endif
                     break;
             }
 

package/Editor/EditorInternal/AirshipEditorInternals.cs

@@ -1,4 +1,7 @@
-using UnityEditor;
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.EventSystems;
 
 namespace Editor.EditorInternal {
     public class AirshipEditorInternals {
@@ -11,5 +14,62 @@ namespace Editor.EditorInternal {
         internal static bool GetBoldDefaultFont() {
             return EditorGUIUtility.GetBoldDefaultFont();
         }
+
+        internal static void ShowObjectSelector(UnityEngine.Object obj, Type objectTypes, UnityEngine.Object objBeingEdited, bool allowSceneObjects) {
+            ObjectSelector.get.Show(obj, objectTypes,objBeingEdited, allowSceneObjects);
+        }
+
+        internal static UnityEngine.Object DoCustomObjectField(Rect position, GUIContent label,
+            UnityEngine.Object value, System.Type type) {
+            int id = "s_ObjectField".GetHashCode();
+            var eventType = Event.current;
+
+            position = EditorGUI.PrefixLabel(position, label);
+
+            switch (eventType.type) {
+                case EventType.MouseDown: {
+                    if (position.Contains(UnityEngine.Event.current.mousePosition) &&
+                        UnityEngine.Event.current.button == 0) {
+                        // Rect buttonRect = EditorGUI.GetButtonRect(visualType, position);
+                        EditorGUIUtility.editingTextField = false;
+                        if (GUI.enabled) {
+                            ShowObjectSelector(value, type, null, true);
+                        }
+                    }
+
+                    break;
+                }
+                case EventType.Repaint: {
+                    EditorGUI.BeginHandleMixedValueContentColor();
+
+                    GUIContent content = EditorGUIUtility.ObjectContent(value, type, false);
+                    Color contentColor = GUI.contentColor;
+                    float a = contentColor.a;
+
+                    try {
+                        if (value == null) {
+                            contentColor.a = 0.7f;
+                            GUI.contentColor = contentColor;
+                        }
+
+                        var buttonRect = new Rect(position.xMax - 19f, position.y, 19f, position.height);
+                        Rect position1 = EditorStyles.objectFieldButton.margin.Remove(buttonRect);
+                        EditorStyles.objectField.Draw(position, content, id, DragAndDrop.activeControlID == id,
+                            position.Contains(UnityEngine.Event.current.mousePosition));
+                        EditorStyles.objectFieldButton.Draw(position1, GUIContent.none, id,
+                            DragAndDrop.activeControlID == id,
+                            position1.Contains(UnityEngine.Event.current.mousePosition));
+
+                        EditorGUI.EndHandleMixedValueContentColor();
+                        break;
+                    } finally {
+                        contentColor.a = a;
+                        GUI.contentColor = contentColor;
+                    }
+                }
+            }
+
+            return null;
+        }
     }
 }

package/Editor/EditorInternal/AirshipObjectGUIInternal.cs

@@ -0,0 +1,205 @@
+
+using System;
+using UnityEditor;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+internal static class AirshipObjectGUIInternal {
+    // Unfortunately this is necessary due to lack of customization
+
+    public delegate void ObjectSelectAction(UnityEngine.Object obj, System.Type[] requiredTypes);
+    
+    private static Object DoCustomObjectField(
+        Rect position, 
+        Rect dropRect, 
+        int id, 
+        Object obj, 
+        Object objBeingEdited, 
+        Type objType,
+        EditorGUI.ObjectFieldValidator validator,
+        bool allowSceneObjects,
+        GUIStyle style,
+        GUIStyle buttonStyle,
+        ObjectSelectAction onRequestSelectObject
+        ) {
+
+        var visualType = EditorGUI.ObjectFieldVisualType.IconAndText;
+        validator ??= EditorGUI.ValidateObjectFieldAssignment;
+        
+        var current = Event.current;
+        var eventType = current.type;
+        var buttonRect = new Rect(position.xMax - 19f, position.y, 19f, position.height);
+        
+        if (eventType == EventType.ContextClick && position.Contains(Event.current.mousePosition))
+        {
+            var actualObject = obj;
+            var menu = new GenericMenu();
+            
+            // if (EditorGUI.FillPropertyContextMenu(null, menu: menu) != null) {
+            //     menu.AddSeparator("");
+            // }
+            
+            menu.AddItem(new GUIContent("Properties..."), false, () => PropertyEditor.OpenPropertyEditor(actualObject));
+            menu.DropDown(position);
+            Event.current.Use();
+        }
+
+        switch (eventType) {
+            case EventType.KeyDown: {
+                if (GUIUtility.keyboardControl == id) {
+                    if (current.keyCode == KeyCode.Backspace || current.keyCode == KeyCode.Delete &&
+                        (current.modifiers & EventModifiers.Shift) == EventModifiers.None) {
+                        obj = null;
+                        GUI.changed = true;
+                        current.Use();
+                    }
+                    if (current.MainActionKeyForControl(id)) {
+                        onRequestSelectObject(obj, new[] { objType });
+                        current.Use();
+                        GUIUtility.ExitGUI();
+                    }
+                }
+                
+                break;
+            }
+            case EventType.MouseDown: {
+                if (position.Contains(Event.current.mousePosition) &&
+                    Event.current.button == 0) {
+
+                    EditorGUIUtility.editingTextField = false;
+                    if (buttonRect.Contains(Event.current.mousePosition)) {
+                        if (GUI.enabled) {
+                            GUIUtility.keyboardControl = id;
+                            
+                            onRequestSelectObject(obj, new[] { objType });
+                            
+                            current.Use();
+                            GUIUtility.ExitGUI();
+                        }
+                    } else {
+                        if (Event.current.clickCount == 1) {
+                            GUIUtility.keyboardControl = id;
+                            EditorGUI.PingObjectOrShowPreviewOnClick(obj, position);
+                            current.Use();
+                        }  else if (Event.current.clickCount == 2 && (bool) obj)
+                        {
+                            AssetDatabase.OpenAsset(obj);
+                            current.Use();
+                            GUIUtility.ExitGUI();
+                        }
+                    }
+                }
+                break;
+            }
+            case EventType.Repaint: {
+                var content = EditorGUIUtility.ObjectContent(obj, objType, null, validator);
+                var contentColor = GUI.contentColor;
+                var a = contentColor.a;
+
+                try {
+                    if (obj == null)
+                    {
+                        contentColor.a = 0.7f;
+                        GUI.contentColor = contentColor;
+                    }
+                    
+                    EditorGUI.BeginHandleMixedValueContentColor();
+                    style.Draw(position, content, id, DragAndDrop.activeControlID == id, position.Contains(UnityEngine.Event.current.mousePosition));
+                    var position1 = buttonStyle.margin.Remove(buttonRect);
+                    buttonStyle.Draw(position1, GUIContent.none, id, DragAndDrop.activeControlID == id, position1.Contains(UnityEngine.Event.current.mousePosition));
+                    EditorGUI.EndHandleMixedValueContentColor();
+                } finally {
+                    contentColor.a = a;
+                    GUI.contentColor = contentColor;
+                }
+                
+                break;
+            }
+            case EventType.DragUpdated:
+            case EventType.DragPerform: {
+                if (dropRect.Contains(UnityEngine.Event.current.mousePosition) && GUI.enabled) {
+                    var objectReferences = DragAndDrop.objectReferences;
+                    var target = validator(objectReferences, objType, null, EditorGUI.ObjectFieldValidatorOptions.None);
+                    if (target != null && !allowSceneObjects && !EditorUtility.IsPersistent(target)) {
+                        target = null;
+                    }
+                    if (target != null) {
+                        if (DragAndDrop.visualMode == DragAndDropVisualMode.None)
+                            DragAndDrop.visualMode = DragAndDropVisualMode.Generic;
+
+                        if (eventType == EventType.DragPerform) {
+                            obj = target;
+                            GUI.changed = true;
+                            DragAndDrop.AcceptDrag();
+                            DragAndDrop.activeControlID = 0;
+                        } else DragAndDrop.activeControlID = id;
+                        current.Use();
+                    }
+                }
+
+                break;
+            }
+            case EventType.DragExited:
+                if (GUI.enabled) HandleUtility.Repaint();
+                break;
+        }
+
+        return obj;
+    }
+
+    public static GUIStyle objectFieldButtonStyle => EditorStyles.objectFieldButton;
+    
+    public static Object DoObjectField(
+        Rect position,
+        Rect dropRect,
+        GUIContent label,
+        int id,
+        Object obj,
+        Object objBeingEdited,
+        Type objType,
+        EditorGUI.ObjectFieldValidator validator,
+        bool allowSceneObjects,
+        GUIStyle style,
+        GUIStyle buttonStyle, 
+        Action<Object> onObjectSelectorClosed = null,
+        Action<Object> onObjectSelectedUpdated = null) {
+        
+        var controlId = GUIUtility.GetControlID(id, FocusType.Keyboard, position);
+        position = EditorGUI.PrefixLabel(position, controlId, label);
+        
+        void ShowObjectSelector(Object onObject, Type[] types) {
+            ObjectSelector.get.Show(onObject, types, onObject, allowSceneObjects, onObjectSelectedUpdated: onObjectSelectedUpdated, onObjectSelectorClosed: onObjectSelectorClosed);
+            ObjectSelector.get.objectSelectorID = controlId;
+        }
+
+        var result = DoCustomObjectField(position, dropRect, controlId, obj, objBeingEdited, objType, validator, allowSceneObjects,
+            style, buttonStyle, ShowObjectSelector);
+
+        var current = Event.current;
+        var commandName = current.commandName;
+        
+        switch (Event.current.type) {
+            case EventType.ExecuteCommand: {
+                if (commandName == "ObjectSelectorUpdated" && ObjectSelector.get.objectSelectorID == controlId) {
+                    return ObjectSelector.GetCurrentObject();
+                }
+                if (commandName == "ObjectSelectorClosed" && ObjectSelector.get.objectSelectorID == controlId)
+                {
+                    if (ObjectSelector.get.GetInstanceID() != 0)
+                        return ObjectSelector.GetCurrentObject();
+                    current.Use();
+                }
+                if ((current.commandName == "Delete" || current.commandName == "SoftDelete") &&
+                    GUIUtility.keyboardControl == id) {
+                    obj = null;
+                    
+                    GUI.changed = true;
+                    current.Use();
+                }
+                break;
+            }
+        }
+
+        return result;
+    }
+}

package/Editor/EditorInternal/AirshipObjectGUIInternal.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: af85da9987c9430f9c17dbbe4e435ba1
+timeCreated: 1759378633

package/Editor/Util/AirshipEditorGUI.cs

@@ -5,7 +5,7 @@ using Editor.EditorInternal;
 using UnityEditor;
 using UnityEngine;
 
-public class AirshipEditorGUI {
+public static class AirshipEditorGUI {
     public static void HorizontalLine(Color color = default, int thickness = 1, int padding = 10, int margin = 0)
     {
         color = color != default ? color : Color.grey;
@@ -28,10 +28,37 @@ public class AirshipEditorGUI {
 
                 break;
         }
-
+        
         EditorGUI.DrawRect(r, color);
     }
 
+    
+    private static GUIStyle _nonClippingObjectField;
+    internal static GUIStyle nonClippingObjectField {
+        get {
+            if (_nonClippingObjectField == null) {
+                _nonClippingObjectField = new GUIStyle(EditorStyles.objectField) {
+                    imagePosition = ImagePosition.ImageLeft,
+                    clipping = TextClipping.Ellipsis,
+                };
+            }
+
+            return _nonClippingObjectField;
+        }
+    }
+
+    public static UnityEngine.Object ObjectField(Rect rect, GUIContent label, UnityEngine.Object currentValue, System.Type type, bool
+        allowSceneObjects) {
+        return AirshipObjectGUIInternal.DoObjectField(rect, rect, label, "k_objectFieldHash".GetHashCode(), currentValue, null,
+            type, null, allowSceneObjects, nonClippingObjectField, AirshipObjectGUIInternal.objectFieldButtonStyle);
+    }
+
+    public static UnityEngine.Object ObjectFieldLayout(GUIContent label, UnityEngine.Object currentValue, System.Type type, bool
+        allowSceneObjects) {
+        var rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight);
+        return ObjectField(rect, label, currentValue, type, allowSceneObjects);
+    }
+
     private const int TabButtonHeight = 22;
     
     private static GUIStyle s_TabOnlyOne;

package/Runtime/Code/AirshipConst.cs

@@ -1,9 +1,16 @@
 // ReSharper disable InconsistentNaming
 
+using System.Collections.Generic;
+using UnityEngine.Scripting;
+
 namespace Code {
-    [LuauAPI]
+    [LuauAPI][Preserve]
     public static class AirshipConst {
-        public const int playerVersion = 17;
+        public const int playerVersion = 18;
+        public static readonly IReadOnlyList<string> playerFlags = new string[] {
+            "SkipLoading",
+        };
+
 
         /// <summary>
         /// The server will kick clients that have a playerVersion lower than this value.