diff --git a/GameLibraries/HavokWrapper.dll b/GameLibraries/HavokWrapper.dll index 2292ea01..e8f11006 100644 Binary files a/GameLibraries/HavokWrapper.dll and b/GameLibraries/HavokWrapper.dll differ diff --git a/GameLibraries/Sandbox.Audio.dll b/GameLibraries/Sandbox.Audio.dll index 6cd4fc00..229d759d 100644 Binary files a/GameLibraries/Sandbox.Audio.dll and b/GameLibraries/Sandbox.Audio.dll differ diff --git a/GameLibraries/Sandbox.Common.XmlSerializers.dll b/GameLibraries/Sandbox.Common.XmlSerializers.dll index 03f0cb30..ac78089b 100644 Binary files a/GameLibraries/Sandbox.Common.XmlSerializers.dll and b/GameLibraries/Sandbox.Common.XmlSerializers.dll differ diff --git a/GameLibraries/Sandbox.Common.dll b/GameLibraries/Sandbox.Common.dll index b95d5a98..9e478132 100644 Binary files a/GameLibraries/Sandbox.Common.dll and b/GameLibraries/Sandbox.Common.dll differ diff --git a/GameLibraries/Sandbox.Game.dll b/GameLibraries/Sandbox.Game.dll index cbd305d7..17874b17 100644 Binary files a/GameLibraries/Sandbox.Game.dll and b/GameLibraries/Sandbox.Game.dll differ diff --git a/GameLibraries/Sandbox.Graphics.dll b/GameLibraries/Sandbox.Graphics.dll index 733e4205..bf1928d7 100644 Binary files a/GameLibraries/Sandbox.Graphics.dll and b/GameLibraries/Sandbox.Graphics.dll differ diff --git a/GameLibraries/Sandbox.Input.dll b/GameLibraries/Sandbox.Input.dll index 3212bc1b..694c1ecd 100644 Binary files a/GameLibraries/Sandbox.Input.dll and b/GameLibraries/Sandbox.Input.dll differ diff --git a/GameLibraries/SharpDX.Direct3D9.dll b/GameLibraries/SharpDX.Direct3D9.dll index f3f13bfc..6d55161c 100644 Binary files a/GameLibraries/SharpDX.Direct3D9.dll and b/GameLibraries/SharpDX.Direct3D9.dll differ diff --git a/GameLibraries/SharpDX.DirectInput.dll b/GameLibraries/SharpDX.DirectInput.dll index 0f4f30c0..2889f8b0 100644 Binary files a/GameLibraries/SharpDX.DirectInput.dll and b/GameLibraries/SharpDX.DirectInput.dll differ diff --git a/GameLibraries/SharpDX.RawInput.dll b/GameLibraries/SharpDX.RawInput.dll index bb2418bc..080d91be 100644 Binary files a/GameLibraries/SharpDX.RawInput.dll and b/GameLibraries/SharpDX.RawInput.dll differ diff --git a/GameLibraries/SharpDX.XAudio2.dll b/GameLibraries/SharpDX.XAudio2.dll index 8dee3eda..4cd08f4d 100644 Binary files a/GameLibraries/SharpDX.XAudio2.dll and b/GameLibraries/SharpDX.XAudio2.dll differ diff --git a/GameLibraries/SharpDX.dll b/GameLibraries/SharpDX.dll index f6d5be3f..e1abb0ef 100644 Binary files a/GameLibraries/SharpDX.dll and b/GameLibraries/SharpDX.dll differ diff --git a/GameLibraries/SpaceEngineersDedicated.exe b/GameLibraries/SpaceEngineersDedicated.exe index db15aeb9..a58b0f9c 100644 Binary files a/GameLibraries/SpaceEngineersDedicated.exe and b/GameLibraries/SpaceEngineersDedicated.exe differ diff --git a/GameLibraries/SteamSDK.dll b/GameLibraries/SteamSDK.dll index feee12d3..4968ef5e 100644 Binary files a/GameLibraries/SteamSDK.dll and b/GameLibraries/SteamSDK.dll differ diff --git a/GameLibraries/VRage.Common.dll b/GameLibraries/VRage.Common.dll index bbc31ab4..b1bc5634 100644 Binary files a/GameLibraries/VRage.Common.dll and b/GameLibraries/VRage.Common.dll differ diff --git a/GameLibraries/VRage.Library.dll b/GameLibraries/VRage.Library.dll index 3cac1ffa..ba94412c 100644 Binary files a/GameLibraries/VRage.Library.dll and b/GameLibraries/VRage.Library.dll differ diff --git a/GameLibraries/VRage.Math.dll b/GameLibraries/VRage.Math.dll index dfefc83f..d232be2d 100644 Binary files a/GameLibraries/VRage.Math.dll and b/GameLibraries/VRage.Math.dll differ diff --git a/GameLibraries/VRage.Render.dll b/GameLibraries/VRage.Render.dll index 83e310ea..25469358 100644 Binary files a/GameLibraries/VRage.Render.dll and b/GameLibraries/VRage.Render.dll differ diff --git a/GameLibraries/steam_api64.dll b/GameLibraries/steam_api64.dll index be6892c2..82bb4739 100644 Binary files a/GameLibraries/steam_api64.dll and b/GameLibraries/steam_api64.dll differ diff --git a/GameLibraries/steamclient64.dll b/GameLibraries/steamclient64.dll index 25a44465..1c433506 100644 Binary files a/GameLibraries/steamclient64.dll and b/GameLibraries/steamclient64.dll differ diff --git a/GameLibraries/tier0_s64.dll b/GameLibraries/tier0_s64.dll index 91c2d229..bc248cb3 100644 Binary files a/GameLibraries/tier0_s64.dll and b/GameLibraries/tier0_s64.dll differ diff --git a/GameLibraries/vstdlib_s64.dll b/GameLibraries/vstdlib_s64.dll index 63614886..343e0bde 100644 Binary files a/GameLibraries/vstdlib_s64.dll and b/GameLibraries/vstdlib_s64.dll differ diff --git a/SEConfigTool/SEConfigTool.cs b/SEConfigTool/SEConfigTool.cs index 97f6b44b..7c02f6d5 100644 --- a/SEConfigTool/SEConfigTool.cs +++ b/SEConfigTool/SEConfigTool.cs @@ -2325,12 +2325,12 @@ private void BTN_BlueprintConfig_Details_Result_New_Click(object sender, EventAr SerializableDefinitionId selectedItem = new SerializableDefinitionId(new MyObjectBuilderType(typeof(MyObjectBuilder_Ore)), "Stone"); MyObjectBuilder_BlueprintDefinition temp = new MyObjectBuilder_BlueprintDefinition(); temp.BaseProductionTimeInSeconds = 1; - temp.Prerequisites = new MyObjectBuilder_BlueprintDefinition.Item[1]; - temp.Prerequisites[0] = new MyObjectBuilder_BlueprintDefinition.Item(); + temp.Prerequisites = new BlueprintItem[1]; + temp.Prerequisites[0] = new BlueprintItem(); temp.Prerequisites[0].TypeId = selectedItem.TypeId.ToString(); temp.Prerequisites[0].SubtypeId = selectedItem.SubtypeName; temp.Prerequisites[0].Amount = "1"; - temp.Result = new MyObjectBuilder_BlueprintDefinition.Item(); + temp.Result = new BlueprintItem(); temp.Result.Amount = "1"; temp.Result.TypeId = selectedItem.TypeId.ToString(); temp.Result.SubtypeId = selectedItem.SubtypeName; diff --git a/SEModAPI/API/Definitions/BlueprintsDefinition.cs b/SEModAPI/API/Definitions/BlueprintsDefinition.cs index 554012c5..eec7482b 100644 --- a/SEModAPI/API/Definitions/BlueprintsDefinition.cs +++ b/SEModAPI/API/Definitions/BlueprintsDefinition.cs @@ -104,11 +104,11 @@ public bool DeleteEntry(BlueprintItemDefinition source) #endregion } - public class BlueprintItemDefinition : OverLayerDefinition + public class BlueprintItemDefinition : OverLayerDefinition { #region "Constructors and Initializers" - public BlueprintItemDefinition(MyObjectBuilder_BlueprintDefinition.Item definition) + public BlueprintItemDefinition(BlueprintItem definition) : base(definition) { } @@ -153,7 +153,7 @@ public string SubTypeId #region "Methods" - protected override string GetNameFrom(MyObjectBuilder_BlueprintDefinition.Item definition) + protected override string GetNameFrom(BlueprintItem definition) { return definition.SubtypeId + " " + definition.TypeId; } @@ -177,7 +177,7 @@ protected override MyObjectBuilder_BlueprintDefinition GetBaseTypeOf(BlueprintsD #endregion } - public class BlueprintItemsManager : SerializableDefinitionsManager + public class BlueprintItemsManager : SerializableDefinitionsManager { } } diff --git a/SEModAPIInternal/API/Common/SandboxGameAssemblyWrapper.cs b/SEModAPIInternal/API/Common/SandboxGameAssemblyWrapper.cs index 63ad8bb8..53a23653 100644 --- a/SEModAPIInternal/API/Common/SandboxGameAssemblyWrapper.cs +++ b/SEModAPIInternal/API/Common/SandboxGameAssemblyWrapper.cs @@ -60,7 +60,7 @@ public class SandboxGameAssemblyWrapper public static string ConfigContainerNamespace = "00DD5482C0A3DF0D94B151167E77A6D9"; public static string ConfigContainerClass = "EB0B0448CDB2C619C686429C597589BC"; - public static string ConfigContainerGetConfigDataMethod = "4DD64FD1D45E514D01C925D07B69B3BE"; + public static string ConfigContainerGetConfigDataMethod = "Load"; public static string ConfigContainerDedicatedDataField = "44A1510B70FC1BBE3664969D47820439"; diff --git a/SEModAPIInternal/API/Entity/BaseEntity.cs b/SEModAPIInternal/API/Entity/BaseEntity.cs index 056992a5..9746c933 100644 --- a/SEModAPIInternal/API/Entity/BaseEntity.cs +++ b/SEModAPIInternal/API/Entity/BaseEntity.cs @@ -838,7 +838,7 @@ public class BaseEntityNetworkManager public static string BaseEntityNetworkManagerNamespace = "5F381EA9388E0A32A8C817841E192BE8"; public static string BaseEntityNetworkManagerClass = "48D79F8E3C8922F14D85F6D98237314C"; - public static string BaseEntityBroadcastRemovalMethod = "37605E21446C66A02114219BC7F64197"; + public static string BaseEntityBroadcastRemovalMethod = "CFE8E4A6F38F8191027E73CC5E5280E0"; //Packets //10 - ?? diff --git a/SEModAPIInternal/API/Entity/PowerProducer.cs b/SEModAPIInternal/API/Entity/PowerProducer.cs index b62cd244..78945b29 100644 --- a/SEModAPIInternal/API/Entity/PowerProducer.cs +++ b/SEModAPIInternal/API/Entity/PowerProducer.cs @@ -18,9 +18,9 @@ public class PowerProducer public static string PowerProducerNamespace = "FB8C11741B7126BD9C97FE76747E087F"; public static string PowerProducerClass = "7E69388ED0DB47818FB7AFF9F16C6EDA"; - public static string PowerProducerGetMaxPowerOutputMethod = "C28C116B5B44725B378E65F4CABF4FA0"; - public static string PowerProducerGetCurrentOutputMethod = "A5430E8F21C664BA9C247FF1C2D056CB"; - public static string PowerProducerSetCurrentOutputMethod = "9FBD89B1710744E648542AB8EFA18FB7"; + public static string PowerProducerGetMaxPowerOutputMethod = "FE788B91CC37143F5E17B61AA19C7E6B"; + public static string PowerProducerGetCurrentOutputMethod = "48EC6A644925F0026AD95B065C711DB1"; + public static string PowerProducerSetCurrentOutputMethod = "478A7FE416688BF2BDC4A38058D7C326"; #endregion diff --git a/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/BatteryBlockEntity.cs b/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/BatteryBlockEntity.cs index 9920db1b..1a732ff4 100644 --- a/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/BatteryBlockEntity.cs +++ b/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/BatteryBlockEntity.cs @@ -391,7 +391,7 @@ public class BatteryBlockNetworkManager public static string BatteryBlockNetManagerCurrentStoredPowerPacketClass = "59DE66D2ECADE0929A1C776D7FA907E2"; - public static string BatteryBlockNetManagerCurrentStoredPowerPacketGetIdMethod = "4E5FB782782D9D0A3F1B2D984232F9D0"; + public static string BatteryBlockNetManagerCurrentStoredPowerPacketGetIdMethod = "283BFB69F94E603F2FABB7C612B71012"; public static string BatteryBlockNetManagerCurrentStoredPowerPacketValueField = "ADC3AB91A03B31875821D57B8B718AF5"; diff --git a/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/CockpitEntity.cs b/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/CockpitEntity.cs index 3c32dc56..60551d00 100644 --- a/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/CockpitEntity.cs +++ b/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/CockpitEntity.cs @@ -28,7 +28,7 @@ public class CockpitEntity : ShipControllerEntity public static string CockpitEntityNamespace = "5BCAC68007431E61367F5B2CF24E2D6F"; public static string CockpitEntityClass = "0A875207E28B2C7707366CDD300684DF"; - public static string CockpitGetPilotEntityMethod = "7B47C9D59A1CEE8DA64A258449704EF8"; + public static string CockpitGetPilotEntityMethod = "0029292655ED44CA0308EEC68108424B"; public static string CockpitSetPilotEntityMethod = "1BB7956FA537A66315E07C562677018A"; #endregion diff --git a/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/LandingGearEntity.cs b/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/LandingGearEntity.cs index a6efbf27..c1f7162c 100644 --- a/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/LandingGearEntity.cs +++ b/SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/LandingGearEntity.cs @@ -27,7 +27,7 @@ public class LandingGearEntity : FunctionalBlockEntity public static string LandingGearNamespace = "6DDCED906C852CFDABA0B56B84D0BD74"; public static string LandingGearClass = "5C73AAF1736F3AA9956574C6D9A2EEBE"; - public static string LandingGearGetAutoLockMethod = "7C88AC26AE0A543E4AD1742FC9C1B70A"; + public static string LandingGearGetAutoLockMethod = "C3BA64D6A05E4CBFF78189520B5112BB"; public static string LandingGearSetAutoLockMethod = "F542ACDC0D61EB46F733A5527CFFBE14"; public static string LandingGearGetBrakeForceMethod = "A84CC3FC7B1C4CA0A631E34D2F024163"; public static string LandingGearSetBrakeForceMethod = "013F45FD594F8A80D5952A7AC22A931E"; diff --git a/SEModAPIInternal/API/Server/ServerNetworkManager.cs b/SEModAPIInternal/API/Server/ServerNetworkManager.cs index 65a051cb..07c2486e 100644 --- a/SEModAPIInternal/API/Server/ServerNetworkManager.cs +++ b/SEModAPIInternal/API/Server/ServerNetworkManager.cs @@ -21,8 +21,8 @@ public class ServerNetworkManager : NetworkManager public static string ServerNetworkManagerClass = "3B0B7A338600A7B9313DE1C3723DAD14"; public static string ServerNetworkManagerDisconnectPlayerMethod = "09FDD2D9700A7E602BE8722F81A55AC6"; - public static string ServerNetworkManagerSetPlayerBannedMethod = "D8507C079F9959AD7F06F37BFDC7712C"; - public static string ServerNetworkManagerKickPlayerMethod = "B0CA1C2C2E07E744FC44C43547A8BDDB"; + public static string ServerNetworkManagerSetPlayerBannedMethod = "07F6B1C444F82D5C2CA7BA6F2616CFE9"; + public static string ServerNetworkManagerKickPlayerMethod = "321581D865E637DE0DD6B67515DC88CF"; public static string ServerNetworkManagerConnectedPlayersField = "89E92B070228A8BC746EFB57A3F6D2E5"; diff --git a/SEServerExtender/Properties/AssemblyInfo.cs b/SEServerExtender/Properties/AssemblyInfo.cs index 44767437..e6acca5d 100644 --- a/SEServerExtender/Properties/AssemblyInfo.cs +++ b/SEServerExtender/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("0.2.10.10")] -[assembly: AssemblyFileVersion("0.2.10.10")] +[assembly: AssemblyVersion("0.2.10.11")] +[assembly: AssemblyFileVersion("0.2.10.11")] diff --git a/SEServerGUI/Service References/ServiceReference/Reference.cs b/SEServerGUI/Service References/ServiceReference/Reference.cs index 700b02be..0d81508e 100644 --- a/SEServerGUI/Service References/ServiceReference/Reference.cs +++ b/SEServerGUI/Service References/ServiceReference/Reference.cs @@ -1332,7 +1332,7 @@ public float Volume { [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_FloatingObject))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_HandDrill))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_Meteor))] - [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_WallPlacer))] + //[System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_WallPlacer))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_Welder))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.Voxels.MyObjectBuilder_VoxelMap))] public partial class CharacterEntityProxy : SEServerGUI.ServiceReference.BaseEntityProxy { @@ -1514,7 +1514,7 @@ public ulong SteamId { [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemDefinition))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemAnimation))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemCubeBlock))] - [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemWallBlock))] + //[System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemWallBlock))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemWeapon))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemEmpty))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemTerminal))] @@ -1626,7 +1626,7 @@ public ulong SteamId { [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_CubePlacer))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_FloatingObject))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_HandDrill))] - [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_WallPlacer))] + //[System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_WallPlacer))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_Welder))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.Voxels.MyObjectBuilder_VoxelMap))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_Character))] @@ -1825,7 +1825,7 @@ public bool IsStatic { [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemDefinition))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemAnimation))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemCubeBlock))] - [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemWallBlock))] + //[System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemWallBlock))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemWeapon))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemEmpty))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_ToolbarItemTerminal))] @@ -1937,7 +1937,7 @@ public bool IsStatic { [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_CubePlacer))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_HandDrill))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_Meteor))] - [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_WallPlacer))] + //[System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_WallPlacer))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_Welder))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.Voxels.MyObjectBuilder_VoxelMap))] [System.Runtime.Serialization.KnownTypeAttribute(typeof(Sandbox.Common.ObjectBuilders.MyObjectBuilder_Character))]