From ece71c45a659a72291a33691876ec35217e435f1 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Jul 2021 22:19:35 +0200 Subject: [PATCH] Update to Techblox 2021.07.21.16.17 --- TechbloxModdingAPI/Blocks/BlockIDs.cs | 17 +++++ TechbloxModdingAPI/Commands/CommandPatch.cs | 72 ------------------- .../Commands/CommandRegistrationHelper.cs | 11 --- TechbloxModdingAPI/TechbloxModdingAPI.csproj | 48 +++++++++++-- 4 files changed, 59 insertions(+), 89 deletions(-) diff --git a/TechbloxModdingAPI/Blocks/BlockIDs.cs b/TechbloxModdingAPI/Blocks/BlockIDs.cs index 8c54140..3538104 100644 --- a/TechbloxModdingAPI/Blocks/BlockIDs.cs +++ b/TechbloxModdingAPI/Blocks/BlockIDs.cs @@ -134,5 +134,22 @@ namespace TechbloxModdingAPI.Blocks AxleServo, HingeServo, Piston, + Button, + Switch, + Dial, + Lever, + ThreeWaySwitch, + EqualsMathBlock, + LessThanMathBlock, + LessThanOrEqualMathBlock, + GreaterThanMathBlock, + GreaterThanOrEqualMathBlock, + HatchbackWheelRigNoSteering, + HatchbackWheelRigWithSteering, + HatchbackEngine, + HatchbackWheel, + HatchbackWheelArch, + HatchbackArchSmallFlare, + HatchbackArchFlare } } \ No newline at end of file diff --git a/TechbloxModdingAPI/Commands/CommandPatch.cs b/TechbloxModdingAPI/Commands/CommandPatch.cs index 6beb7f7..169891a 100644 --- a/TechbloxModdingAPI/Commands/CommandPatch.cs +++ b/TechbloxModdingAPI/Commands/CommandPatch.cs @@ -23,78 +23,6 @@ namespace TechbloxModdingAPI.Commands /*CommandLineCompositionRoot.Compose(contextHolder, stateSyncReg.enginesRoot, reloadGame, multiplayerParameters, stateSyncReg); - uREPL C# compilation not supported anymore */ var enginesRoot = stateSyncReg.enginesRoot; - var entityFunctions = enginesRoot.GenerateEntityFunctions(); - var entityFactory = enginesRoot.GenerateEntityFactory(); - var entitySerializer = enginesRoot.GenerateEntitySerializer(); - Logging.MetaDebugLog("Adding existing command engines"); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteSetGravityCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteSetPhysicsPrecisionCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteSetPhysicsFrequencyCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName( - "RobocraftX.GUI.CommandLine.ExecuteClearAllPartsCommandEngine"), - entityFunctions)); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteHelpCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName( - "RobocraftX.GUI.CommandLine.ExecuteSetLinearRestingThresholdCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName( - "RobocraftX.GUI.CommandLine.ExecuteSetAngularRestingThresholdCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteEnableVisualProfilerCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteSetNetworkJitterFramesEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteSetSendConnectedEntitiesCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteSetMaxSimFramesEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.SetDebugDisplayExtraInfoCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.SetNetSyncBandwidthLimitCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ThrowExceptionCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.SetPriorityCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.TeleportCharacterCommandEngine"), - entityFactory)); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ChangeTextBlockTextCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.SetCharacterRunSpeedCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.SetCameraZoomDistanceCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.EditLightingSettingsCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.EditSkySettingsCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.EditFogSettingsCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.TeleportCharacterImplementationEngine"), - entityFunctions)); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteConnectToServerCommandEngine"), - entityFunctions, entitySerializer, reloadGame, multiplayerParameters)); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.SetInputBroadcastCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ExecuteSetJointInertiaTensorCommandEngine"))); - enginesRoot.AddEngine( - (IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.ChangeTeamCommandEngine"))); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.DamageCharacterCommandEngine"), entityFactory)); - enginesRoot.AddEngine((IEngine) Activator.CreateInstance( - AccessTools.TypeByName("RobocraftX.GUI.CommandLine.DisableCharacterDamageCommandEngine"))); - Logging.MetaDebugLog("Existing command engines added"); - CommandManager.RegisterEngines(enginesRoot); } diff --git a/TechbloxModdingAPI/Commands/CommandRegistrationHelper.cs b/TechbloxModdingAPI/Commands/CommandRegistrationHelper.cs index 850322a..18f3a25 100644 --- a/TechbloxModdingAPI/Commands/CommandRegistrationHelper.cs +++ b/TechbloxModdingAPI/Commands/CommandRegistrationHelper.cs @@ -5,7 +5,6 @@ using System.Text; using System.Threading.Tasks; using uREPL; -using RobocraftX.CommandLine.Custom; namespace TechbloxModdingAPI.Commands { @@ -18,8 +17,6 @@ namespace TechbloxModdingAPI.Commands public static void Register(string name, Action action, string desc, bool noConsole = false) { RuntimeCommands.Register(name, action, desc); - if (noConsole) { return; } - ConsoleCommands.Register(name, action, desc); } public static void Register(string name, Action action, string desc, bool noConsole = false) @@ -40,29 +37,21 @@ namespace TechbloxModdingAPI.Commands public static void Register(string name, Action action, string desc, bool noConsole = false) { RuntimeCommands.Register(name, action, desc); - if (noConsole) { return; } - ConsoleCommands.Register(name, action, desc); } public static void Register(string name, Action action, string desc, bool noConsole = false) { RuntimeCommands.Register(name, action, desc); - if (noConsole) { return; } - ConsoleCommands.Register(name, action, desc); } public static void Register(string name, Action action, string desc, bool noConsole = false) { RuntimeCommands.Register(name, action, desc); - if (noConsole) { return; } - ConsoleCommands.Register(name, action, desc); } public static void Unregister(string name, bool noConsole = false) { RuntimeCommands.Unregister(name); - if (noConsole) { return; } - ConsoleCommands.Unregister(name); } public static void Call(string name) diff --git a/TechbloxModdingAPI/TechbloxModdingAPI.csproj b/TechbloxModdingAPI/TechbloxModdingAPI.csproj index 2de8b34..2aca43c 100644 --- a/TechbloxModdingAPI/TechbloxModdingAPI.csproj +++ b/TechbloxModdingAPI/TechbloxModdingAPI.csproj @@ -56,13 +56,13 @@ ..\ref\TechbloxPreview_Data\Managed\Blocks.HUDFeedbackBlocks.dll ..\..\ref\TechbloxPreview_Data\Managed\Blocks.HUDFeedbackBlocks.dll - - ..\ref\TechbloxPreview_Data\Managed\CommandLine.dll - ..\..\ref\TechbloxPreview_Data\Managed\CommandLine.dll + + ..\ref\TechbloxPreview_Data\Managed\Boxophobic.TheVehetationEngine.Runtime.dll + ..\..\ref\TechbloxPreview_Data\Managed\Boxophobic.TheVehetationEngine.Runtime.dll - - ..\ref\TechbloxPreview_Data\Managed\CommandLineCompositionRoot.dll - ..\..\ref\TechbloxPreview_Data\Managed\CommandLineCompositionRoot.dll + + ..\ref\TechbloxPreview_Data\Managed\Boxophobic.Utils.Scripts.dll + ..\..\ref\TechbloxPreview_Data\Managed\Boxophobic.Utils.Scripts.dll ..\ref\TechbloxPreview_Data\Managed\DataLoader.dll @@ -580,6 +580,10 @@ ..\ref\TechbloxPreview_Data\Managed\Svelto.ECS.dll ..\..\ref\TechbloxPreview_Data\Managed\Svelto.ECS.dll + + ..\ref\TechbloxPreview_Data\Managed\Svelto.ECS.GUI.dll + ..\..\ref\TechbloxPreview_Data\Managed\Svelto.ECS.GUI.dll + ..\ref\TechbloxPreview_Data\Managed\Svelto.Services.dll ..\..\ref\TechbloxPreview_Data\Managed\Svelto.Services.dll @@ -596,6 +600,10 @@ ..\ref\TechbloxPreview_Data\Managed\Techblox.Backend.dll ..\..\ref\TechbloxPreview_Data\Managed\Techblox.Backend.dll + + ..\ref\TechbloxPreview_Data\Managed\Techblox.Building.Rules.dll + ..\..\ref\TechbloxPreview_Data\Managed\Techblox.Building.Rules.dll + ..\ref\TechbloxPreview_Data\Managed\Techblox.BuildingDrone.dll ..\..\ref\TechbloxPreview_Data\Managed\Techblox.BuildingDrone.dll @@ -604,6 +612,10 @@ ..\ref\TechbloxPreview_Data\Managed\Techblox.Camera.dll ..\..\ref\TechbloxPreview_Data\Managed\Techblox.Camera.dll + + ..\ref\TechbloxPreview_Data\Managed\Techblox.ContextSensitiveTextHint.dll + ..\..\ref\TechbloxPreview_Data\Managed\Techblox.ContextSensitiveTextHint.dll + ..\ref\TechbloxPreview_Data\Managed\Techblox.EngineBlock.dll ..\..\ref\TechbloxPreview_Data\Managed\Techblox.EngineBlock.dll @@ -612,6 +624,18 @@ ..\ref\TechbloxPreview_Data\Managed\Techblox.Environment.dll ..\..\ref\TechbloxPreview_Data\Managed\Techblox.Environment.dll + + ..\ref\TechbloxPreview_Data\Managed\Techblox.GUI.Building.dll + ..\..\ref\TechbloxPreview_Data\Managed\Techblox.GUI.Building.dll + + + ..\ref\TechbloxPreview_Data\Managed\Techblox.GUI.BuildRules.dll + ..\..\ref\TechbloxPreview_Data\Managed\Techblox.GUI.BuildRules.dll + + + ..\ref\TechbloxPreview_Data\Managed\Techblox.GUI.BuildRules.MockUps.dll + ..\..\ref\TechbloxPreview_Data\Managed\Techblox.GUI.BuildRules.MockUps.dll + ..\ref\TechbloxPreview_Data\Managed\Techblox.GUI.dll ..\..\ref\TechbloxPreview_Data\Managed\Techblox.GUI.dll @@ -656,6 +680,10 @@ ..\ref\TechbloxPreview_Data\Managed\Techblox.Pointer.dll ..\..\ref\TechbloxPreview_Data\Managed\Techblox.Pointer.dll + + ..\ref\TechbloxPreview_Data\Managed\Techblox.SaveGamesConversion.dll + ..\..\ref\TechbloxPreview_Data\Managed\Techblox.SaveGamesConversion.dll + ..\ref\TechbloxPreview_Data\Managed\Techblox.Services.Eos.dll ..\..\ref\TechbloxPreview_Data\Managed\Techblox.Services.Eos.dll @@ -784,6 +812,14 @@ ..\ref\TechbloxPreview_Data\Managed\Unity.Properties.UI.dll ..\..\ref\TechbloxPreview_Data\Managed\Unity.Properties.UI.dll + + ..\ref\TechbloxPreview_Data\Managed\Unity.Recorder.Base.dll + ..\..\ref\TechbloxPreview_Data\Managed\Unity.Recorder.Base.dll + + + ..\ref\TechbloxPreview_Data\Managed\Unity.Recorder.dll + ..\..\ref\TechbloxPreview_Data\Managed\Unity.Recorder.dll + ..\ref\TechbloxPreview_Data\Managed\Unity.RenderPipelines.Core.Runtime.dll ..\..\ref\TechbloxPreview_Data\Managed\Unity.RenderPipelines.Core.Runtime.dll