Compare commits
No commits in common. "master" and "v2.3.0" have entirely different histories.
38 changed files with 2274 additions and 3918 deletions
|
|
@ -5,7 +5,7 @@ from pathlib import Path, PurePath
|
|||
import re
|
||||
import os
|
||||
|
||||
DLL_EXCLUSIONS_REGEX = r"(System|Microsoft|Mono|IronPython|DiscordRPC|IllusionInjector|IllusionPlugin|netstandard)\."
|
||||
DLL_EXCLUSIONS_REGEX = r"(System|Microsoft|Mono|IronPython|DiscordRPC)\."
|
||||
|
||||
def getAssemblyReferences(path):
|
||||
asmDir = Path(path)
|
||||
|
|
@ -15,12 +15,10 @@ def getAssemblyReferences(path):
|
|||
addedPath = "../"
|
||||
asmDir = Path(addedPath + path)
|
||||
for child in asmDir.iterdir():
|
||||
if child.is_file() and re.search(DLL_EXCLUSIONS_REGEX, str(child)) is None and str(child).lower().endswith(".dll"):
|
||||
if child.is_file() and re.search(DLL_EXCLUSIONS_REGEX, str(child), re.I) is None and str(child).lower().endswith(".dll"):
|
||||
childstr = str(child)
|
||||
childstr = os.path.relpath(childstr, addedPath).replace("\\", "/")
|
||||
result.append(childstr)
|
||||
result.sort(key=str.lower)
|
||||
result = [path + "/IllusionInjector.dll", path + "/IllusionPlugin.dll"] + result # Always put it on top
|
||||
return result
|
||||
|
||||
def buildReferencesXml(path):
|
||||
|
|
@ -41,7 +39,7 @@ if __name__ == "__main__":
|
|||
args = parser.parse_args()
|
||||
|
||||
print("Building Assembly references")
|
||||
asmXml = buildReferencesXml("../ref_TB/Techblox_Data/Managed")
|
||||
asmXml = buildReferencesXml("../ref/Techblox_Data/Managed")
|
||||
# print(asmXml)
|
||||
|
||||
with open("../TechbloxModdingAPI/TechbloxModdingAPI.csproj", "r") as xmlFile:
|
||||
|
|
@ -53,7 +51,7 @@ if __name__ == "__main__":
|
|||
if depsStart is None or depsEnd is None:
|
||||
print("Unable to find dependency XML comments, aborting!")
|
||||
exit(1)
|
||||
newFileStr = fileStr[:depsStart.start() - 1] + "\n" + asmXml + "\n" + fileStr[depsEnd.end() + 1:]
|
||||
newFileStr = fileStr[:depsStart.start()] + "\n" + asmXml + "\n" + fileStr[depsEnd.end() + 1:]
|
||||
with open("../TechbloxModdingAPI/TechbloxModdingAPI.csproj", "w") as xmlFile:
|
||||
print("Writing Assembly references")
|
||||
xmlFile.write(newFileStr)
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ namespace CodeGenerator
|
|||
codeUnit.Namespaces.Add(ns);
|
||||
|
||||
var provider = CodeDomProvider.CreateProvider("CSharp");
|
||||
var path = $@"../../../../TechbloxModdingAPI/Blocks/{name}.cs";
|
||||
var path = $@"..\..\..\..\TechbloxModdingAPI\Blocks\{name}.cs";
|
||||
using (var sw = new StreamWriter(path))
|
||||
{
|
||||
provider.GenerateCodeFromCompileUnit(codeUnit, sw, new CodeGeneratorOptions {BracingStyle = "C"});
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,12 +1,9 @@
|
|||
using System.Collections.Generic;
|
||||
using HarmonyLib;
|
||||
using RobocraftX.Blocks;
|
||||
using RobocraftX.Common;
|
||||
using RobocraftX.GroupTags;
|
||||
using RobocraftX.PilotSeat;
|
||||
using Svelto.ECS;
|
||||
using Techblox.EngineBlock;
|
||||
using Techblox.ServoBlocksServer;
|
||||
using Techblox.ObjectIDBlockServer;
|
||||
using Techblox.WheelRigBlock;
|
||||
|
||||
namespace CodeGenerator
|
||||
|
|
@ -14,11 +11,6 @@ namespace CodeGenerator
|
|||
internal class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
GenerateBlockClasses();
|
||||
}
|
||||
|
||||
private static void GenerateBlockClasses()
|
||||
{
|
||||
var bcg = new BlockClassGenerator();
|
||||
bcg.Generate("Engine", null, new Dictionary<string, string>
|
||||
|
|
@ -32,7 +24,7 @@ namespace CodeGenerator
|
|||
},
|
||||
typeof(TweakableJointDampingComponent), typeof(DampedSpringReadOnlyStruct));
|
||||
bcg.Generate("LogicGate", "LOGIC_BLOCK_GROUP");
|
||||
bcg.Generate("Servo", types: typeof(ServoReadOnlyTweakableComponent), renames: new Dictionary<string, string>
|
||||
bcg.Generate("Servo", types: typeof(ServoReadOnlyStruct), renames: new Dictionary<string, string>
|
||||
{
|
||||
{"minDeviation", "MinimumAngle"},
|
||||
{"maxDeviation", "MaximumAngle"},
|
||||
|
|
@ -47,7 +39,7 @@ namespace CodeGenerator
|
|||
{"pistonVelocity", "MaximumForce"}
|
||||
}, typeof(PistonReadOnlyStruct));
|
||||
bcg.Generate("Motor", null, null, typeof(MotorReadOnlyStruct));
|
||||
//bcg.Generate("ObjectID", "ObjectIDBlockExclusiveGroups.OBJECT_ID_BLOCK_GROUP", null, typeof(ObjectIDTweakableComponent));
|
||||
bcg.Generate("ObjectID", "ObjectIDBlockExclusiveGroups.OBJECT_ID_BLOCK_GROUP", null, typeof(ObjectIDTweakableComponent));
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,25 +0,0 @@
|
|||
using System.Text.RegularExpressions;
|
||||
using Mono.Cecil;
|
||||
|
||||
Console.WriteLine("Starting assembly editing...");
|
||||
var fileRegex =
|
||||
new Regex(".*(Techblox|Gamecraft|RobocraftX|FullGame|RobocraftECS|DataLoader|RCX|GameState|Svelto\\.ECS)[^/]*(\\.dll)");
|
||||
foreach (var file in Directory.EnumerateFiles(@"../../../../../ref/Techblox_Data/Managed"))
|
||||
{
|
||||
if (!fileRegex.IsMatch(file)) continue;
|
||||
Console.WriteLine(file);
|
||||
ProcessAssembly(file);
|
||||
}
|
||||
|
||||
void ProcessAssembly(string path)
|
||||
{
|
||||
using var mod = ModuleDefinition.ReadModule(path, new(ReadingMode.Immediate) { ReadWrite = true });
|
||||
foreach (var typeDefinition in mod.Types)
|
||||
{
|
||||
typeDefinition.IsPublic = true;
|
||||
foreach (var method in typeDefinition.Methods) method.IsPublic = true;
|
||||
foreach (var field in typeDefinition.Fields) field.IsPublic = true;
|
||||
}
|
||||
|
||||
mod.Write();
|
||||
}
|
||||
|
|
@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechbloxModdingAPI", "Techb
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGenerator", "CodeGenerator\CodeGenerator.csproj", "{0EBB6400-95A7-4A3D-B2ED-BF31E364CC10}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeEverythingPublicInGame", "MakeEverythingPublicInGame\MakeEverythingPublicInGame.csproj", "{391A3107-E5C6-4A04-9467-6D868AA9A8B4}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -28,12 +26,6 @@ Global
|
|||
{0EBB6400-95A7-4A3D-B2ED-BF31E364CC10}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{0EBB6400-95A7-4A3D-B2ED-BF31E364CC10}.Test|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{0EBB6400-95A7-4A3D-B2ED-BF31E364CC10}.Test|Any CPU.Build.0 = Debug|Any CPU
|
||||
{391A3107-E5C6-4A04-9467-6D868AA9A8B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{391A3107-E5C6-4A04-9467-6D868AA9A8B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{391A3107-E5C6-4A04-9467-6D868AA9A8B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{391A3107-E5C6-4A04-9467-6D868AA9A8B4}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{391A3107-E5C6-4A04-9467-6D868AA9A8B4}.Test|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{391A3107-E5C6-4A04-9467-6D868AA9A8B4}.Test|Any CPU.Build.0 = Debug|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -114,6 +114,11 @@ namespace TechbloxModdingAPI.App
|
|||
popup.SecondButton();
|
||||
}
|
||||
|
||||
internal void CloseBetaPopup()
|
||||
{
|
||||
Game.menuEngine.CloseBetaPopup();
|
||||
}
|
||||
|
||||
internal static void Init()
|
||||
{
|
||||
// this would have been so much simpler if this didn't involve a bunch of internal fields & classes
|
||||
|
|
|
|||
|
|
@ -140,19 +140,18 @@ namespace TechbloxModdingAPI.App
|
|||
{
|
||||
var allBlocks = entitiesDB.QueryEntities<BlockTagEntityStruct>();
|
||||
List<EGID> blockEGIDs = new List<EGID>();
|
||||
foreach (var ((_, ids, count), group) in allBlocks)
|
||||
foreach (var ((buffer, count), _) in allBlocks)
|
||||
{
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
var id = new EGID(ids[i], group);
|
||||
uint dbid;
|
||||
if (filter == BlockIDs.Invalid)
|
||||
dbid = (uint)filter;
|
||||
else
|
||||
dbid = entitiesDB.QueryEntity<DBEntityStruct>(id).DBID;
|
||||
var ownership = entitiesDB.QueryEntity<BlockOwnershipComponent>(id).BlockOwnership;
|
||||
dbid = entitiesDB.QueryEntity<DBEntityStruct>(buffer[i].ID).DBID;
|
||||
var ownership = entitiesDB.QueryEntity<BlockOwnershipComponent>(buffer[i].ID).BlockOwnership;
|
||||
if ((ownership & BlockOwnership.User) != 0 && dbid == (ulong)filter)
|
||||
blockEGIDs.Add(id);
|
||||
blockEGIDs.Add(buffer[i].ID);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -154,6 +154,16 @@ namespace TechbloxModdingAPI.App
|
|||
{
|
||||
return ref entitiesDB.QueryEntity<T>(id);
|
||||
}
|
||||
|
||||
internal void CloseBetaPopup()
|
||||
{
|
||||
var (buffer, count) = entitiesDB.QueryEntities<TogglePanelButtonEntityViewStruct>(ExclusiveGroup.Search("BetaPopup"));
|
||||
for (int index = 0; index < count; ++index)
|
||||
{
|
||||
entitiesDB.QueryEntity<GUIEntityViewStruct>(buffer[index].TogglePanelButtonComponent.targetPanel)
|
||||
.guiRoot.enabled = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal class MyGameDataEntityDescriptor_DamnItFJWhyDidYouMakeThisInternal : GenericEntityDescriptor<MyGameDataEntityStruct> { }
|
||||
|
|
|
|||
|
|
@ -441,10 +441,9 @@ namespace TechbloxModdingAPI
|
|||
public SimBody GetSimBody()
|
||||
{
|
||||
var st = BlockEngine.GetBlockInfo<GridConnectionsEntityStruct>(this);
|
||||
/*return st.machineRigidBodyId != uint.MaxValue
|
||||
? new SimBody(st.machineRigidBodyId, st.clusterId) - TODO:
|
||||
: null;*/
|
||||
return null;
|
||||
return st.machineRigidBodyId != uint.MaxValue
|
||||
? new SimBody(st.machineRigidBodyId, st.clusterId)
|
||||
: null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -302,7 +302,6 @@ namespace TechbloxModdingAPI.Blocks
|
|||
FloodLight,
|
||||
SoccerBall,
|
||||
CircularWallLight,
|
||||
BlueSkyAtmos,
|
||||
DirtToGrassTransitionTile = 393,
|
||||
DirtToGrassTransitionInnerTile,
|
||||
DirtToGrassTransitionOuterTile,
|
||||
|
|
@ -334,50 +333,13 @@ namespace TechbloxModdingAPI.Blocks
|
|||
DistanceSensor,
|
||||
Stabilizer,
|
||||
ObjectID,
|
||||
ScoreToTechpointConversion,
|
||||
TeamScore,
|
||||
TeamScore = 428,
|
||||
ScorePickupBlock,
|
||||
SportyHatchbackDriverSeat,
|
||||
SportyHatchbackPassengerSeat,
|
||||
FlamingExhaust = 433,
|
||||
SmokingExhaust,
|
||||
StreetLamp,
|
||||
Vector7HatchbackWheel,
|
||||
Vector7HatchbackWheelWideProfile,
|
||||
Vector7SedanWheel,
|
||||
Vector7SedanWideProfile,
|
||||
Vector7FormulaWheel,
|
||||
Vector7FormulaWheelRear,
|
||||
Vector7MonsterTruckWheel,
|
||||
Vector7TruckWheel,
|
||||
Vector7TruckWheelDouble,
|
||||
BusSeat,
|
||||
XLJet,
|
||||
XXLJet,
|
||||
ElectricSedanEngine,
|
||||
HeadlampIndicator,
|
||||
HeadlampSrip,
|
||||
HeadlampStripEdge,
|
||||
ConstantBlock,
|
||||
StreetLamp = 435,
|
||||
ConstantBlock = 452,
|
||||
CounterBlock,
|
||||
SmallGridHill,
|
||||
SmallGridHillInnerCorner,
|
||||
SmallGridHillOuterCorner,
|
||||
AimingAxleServo,
|
||||
AimingHingeServo,
|
||||
WeaponDisabler,
|
||||
Vector7SmallJet,
|
||||
Vector7MediumJet,
|
||||
Vector7LargeJet,
|
||||
Vector7XLJet,
|
||||
Vector7XXLJet,
|
||||
APCWheelRigNoSteering,
|
||||
APCWheelRigWithSteering,
|
||||
APCWheel,
|
||||
APCSeat,
|
||||
APCEngine,
|
||||
DamageScoreBlock,
|
||||
KillScoreBlock,
|
||||
Autocannon = 480
|
||||
SmallGridHillOuterCorner
|
||||
}
|
||||
}
|
||||
|
|
@ -32,15 +32,6 @@ namespace TechbloxModdingAPI.Blocks
|
|||
WoodPainted,
|
||||
WoodRoughGrungy,
|
||||
Boundary,
|
||||
Emissive,
|
||||
AircraftPanelingRivetedPainted,
|
||||
AircraftPanelingRivetedMetallic,
|
||||
SteelBodyworkPearlescent,
|
||||
SteelBodyworkRadWrap,
|
||||
SteelBodyworkGlitter,
|
||||
BouncyRubber,
|
||||
BouncyRubberTieDye,
|
||||
BrickPainted,
|
||||
FuturisticPanelingRivetedPainted,
|
||||
Emissive
|
||||
}
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@ using System.Reflection;
|
|||
|
||||
using DataLoader;
|
||||
using Svelto.Tasks;
|
||||
using Svelto.Tasks.Enumerators;
|
||||
using Unity.Mathematics;
|
||||
|
||||
using TechbloxModdingAPI.Tests;
|
||||
|
|
@ -79,50 +80,35 @@ namespace TechbloxModdingAPI.Blocks
|
|||
yield break;
|
||||
for (var index = 0; index < blocks.Length; index++)
|
||||
{
|
||||
if (index % 10 == 0) yield return new WaitForSecondsEnumerator(1f).Continue(); //The material or flipped status can only be changed 130 times per submission
|
||||
var block = blocks[index];
|
||||
if (!block.Exists) continue;
|
||||
foreach (var property in block.GetType().GetProperties())
|
||||
{
|
||||
//Includes specialised block properties
|
||||
if (property.SetMethod == null) continue;
|
||||
|
||||
bool3 Float3Compare(float3 a, float3 b)
|
||||
{ // From Unity reference code
|
||||
return math.abs(b - a) < math.max(
|
||||
0.000001f * math.max(math.abs(a), math.abs(b)),
|
||||
float.Epsilon * 8
|
||||
);
|
||||
}
|
||||
bool4 Float4Compare(float4 a, float4 b)
|
||||
{ // From Unity reference code
|
||||
return math.abs(b - a) < math.max(
|
||||
0.000001f * math.max(math.abs(a), math.abs(b)),
|
||||
float.Epsilon * 8
|
||||
);
|
||||
}
|
||||
|
||||
var testValues = new (Type, object, Predicate<(object Value, object Default)>)[]
|
||||
var testValues = new (Type, object, Predicate<object>)[]
|
||||
{
|
||||
//(type, default value, predicate or null for equality)
|
||||
(typeof(long), 3, null),
|
||||
(typeof(int), 4, null),
|
||||
(typeof(double), 5.2f, t => Math.Abs((double) t.Value - (double) t.Default) < float.Epsilon),
|
||||
(typeof(float), 5.2f, t => Math.Abs((float) t.Value - (float) t.Default) < float.Epsilon),
|
||||
(typeof(bool), true, t => (bool) t.Value),
|
||||
(typeof(string), "Test", t => (string) t.Value == "Test"), //String equality check
|
||||
(typeof(float3), (float3) 20, t => math.all(Float3Compare((float3)t.Value, (float3)t.Default))),
|
||||
(typeof(double), 5.2f, obj => Math.Abs((double) obj - 5.2f) < float.Epsilon),
|
||||
(typeof(float), 5.2f, obj => Math.Abs((float) obj - 5.2f) < float.Epsilon),
|
||||
(typeof(bool), true, obj => (bool) obj),
|
||||
(typeof(string), "Test", obj => (string) obj == "Test"), //String equality check
|
||||
(typeof(float3), (float3) 2, obj => math.all((float3) obj - 2 < (float3) float.Epsilon)),
|
||||
(typeof(BlockColor), new BlockColor(BlockColors.Aqua, 2), null),
|
||||
(typeof(float4), (float4) 5, t => math.all(Float4Compare((float4)t.Value, (float4)t.Default)))
|
||||
(typeof(float4), (float4) 5, obj => math.all((float4) obj - 5 < (float4) float.Epsilon))
|
||||
};
|
||||
var propType = property.PropertyType;
|
||||
if (!propType.IsValueType) continue;
|
||||
(object valueToUse, Predicate<(object Value, object Default)> predicateToUse) = (null, null);
|
||||
(object valueToUse, Predicate<object> predicateToUse) = (null, null);
|
||||
foreach (var (type, value, predicate) in testValues)
|
||||
{
|
||||
if (type.IsAssignableFrom(propType))
|
||||
{
|
||||
valueToUse = value;
|
||||
predicateToUse = predicate ?? (t => Equals(t.Value, t.Default));
|
||||
predicateToUse = predicate ?? (obj => Equals(obj, value));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -131,7 +117,7 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
var values = propType.GetEnumValues();
|
||||
valueToUse = values.GetValue(values.Length / 2);
|
||||
predicateToUse = t => Equals(t.Value, t.Default);
|
||||
predicateToUse = val => Equals(val, valueToUse);
|
||||
}
|
||||
|
||||
if (valueToUse == null)
|
||||
|
|
@ -159,7 +145,7 @@ namespace TechbloxModdingAPI.Blocks
|
|||
continue;
|
||||
}
|
||||
var attr = property.GetCustomAttribute<TestValueAttribute>();
|
||||
if (!predicateToUse((got, valueToUse)) && (attr == null || !Equals(attr.PossibleValue, got)))
|
||||
if (!predicateToUse(got) && (attr == null || !Equals(attr.PossibleValue, got)))
|
||||
{
|
||||
Assert.Fail($"Property {block.GetType().Name}.{property.Name} value {got} does not equal {valueToUse} for block {block}.");
|
||||
yield break;
|
||||
|
|
|
|||
|
|
@ -23,18 +23,18 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
}
|
||||
|
||||
/*/// <summary> - TODO: Internal struct access
|
||||
/// <summary>
|
||||
/// Gets or sets the Engine's On property. May not be saved.
|
||||
/// </summary>
|
||||
public bool On
|
||||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).engineOn;
|
||||
return ((bool)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "engineOn")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).engineOn = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "engineOn", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -45,11 +45,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).currentGear;
|
||||
return ((int)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "currentGear")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).currentGear = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "currentGear", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -60,11 +60,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).gearChangeCountdown;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "gearChangeCountdown")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).gearChangeCountdown = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "gearChangeCountdown", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -75,11 +75,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).currentRpmAV;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "currentRpmAV")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).currentRpmAV = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "currentRpmAV", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -90,11 +90,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).currentRpmLV;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "currentRpmLV")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).currentRpmLV = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "currentRpmLV", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -105,11 +105,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).targetRpmAV;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "targetRpmAV")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).targetRpmAV = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "targetRpmAV", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -120,11 +120,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).targetRpmLV;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "targetRpmLV")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).targetRpmLV = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "targetRpmLV", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -135,11 +135,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).currentTorque;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "currentTorque")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).currentTorque = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "currentTorque", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -150,11 +150,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).totalWheelVelocityAV;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "totalWheelVelocityAV")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).totalWheelVelocityAV = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "totalWheelVelocityAV", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -165,11 +165,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).totalWheelVelocityLV;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "totalWheelVelocityLV")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).totalWheelVelocityLV = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "totalWheelVelocityLV", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -180,11 +180,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).totalWheelCount;
|
||||
return ((int)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "totalWheelCount")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).totalWheelCount = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "totalWheelCount", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -195,11 +195,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).lastGearUpInput;
|
||||
return ((bool)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "lastGearUpInput")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).lastGearUpInput = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "lastGearUpInput", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -210,11 +210,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).lastGearDownInput;
|
||||
return ((bool)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "lastGearDownInput")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).lastGearDownInput = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "lastGearDownInput", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -225,11 +225,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).manualToAutoGearCoolOffCounter;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "manualToAutoGearCoolOffCounter")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).manualToAutoGearCoolOffCounter = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "manualToAutoGearCoolOffCounter", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -240,11 +240,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).load;
|
||||
return ((float)(BlockEngine.GetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "load")));
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockComponent>(this).load = value;
|
||||
BlockEngine.SetBlockInfo(this, HarmonyLib.AccessTools.TypeByName("Techblox.EngineBlock.EngineBlockComponent"), "load", value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -377,6 +377,6 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.EngineBlock.EngineBlockReadonlyComponent>(this).manualToAutoGearCoolOffTime = value;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using HarmonyLib;
|
||||
|
||||
using Gamecraft.ColourPalette;
|
||||
using Gamecraft.TimeRunning;
|
||||
using Gamecraft.Wires;
|
||||
using RobocraftX.Blocks;
|
||||
using RobocraftX.Common;
|
||||
|
|
@ -21,8 +23,6 @@ using Unity.Mathematics;
|
|||
|
||||
using TechbloxModdingAPI.Engines;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
using TechbloxModdingAPI.Utility.ECS;
|
||||
using PrefabsID = RobocraftX.Common.PrefabsID;
|
||||
|
||||
namespace TechbloxModdingAPI.Blocks.Engines
|
||||
{
|
||||
|
|
@ -55,13 +55,12 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
{
|
||||
for(int i = 0; i < count; i++)
|
||||
{
|
||||
ecoll[i].areConnectionsAssigned = false;
|
||||
ecoll[i].isProcessed = false;
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: GetConnectedCubesUtility
|
||||
/*ConnectedCubesUtility.TreeTraversal.GetConnectedCubes(entitiesDB, blockID, cubeStack, cubes,
|
||||
(in GridConnectionsEntityStruct _) => false);*/
|
||||
ConnectedCubesUtility.TreeTraversal.GetConnectedCubes(entitiesDB, blockID, cubeStack, cubes,
|
||||
(in GridConnectionsEntityStruct _) => false);
|
||||
|
||||
var ret = new Block[cubes.count];
|
||||
for (int i = 0; i < cubes.count; i++)
|
||||
|
|
@ -72,7 +71,7 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
public float4 ConvertBlockColor(byte index) => index == byte.MaxValue
|
||||
? new float4(-1f, -1f, -1f, -1f)
|
||||
: entitiesDB.QueryEntity<PaletteEntryEntityStruct>(index,
|
||||
ColourPaletteExclusiveGroups.COLOUR_PALETTE_GROUP).Colour;
|
||||
CommonExclusiveGroups.COLOUR_PALETTE_GROUP).Colour;
|
||||
|
||||
public OptionalRef<T> GetBlockInfoOptional<T>(Block block) where T : unmanaged, IEntityComponent
|
||||
{
|
||||
|
|
@ -162,7 +161,7 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
|
||||
public void UpdateBlockColor(EGID id)
|
||||
{
|
||||
entitiesDB.PublishEntityChangeDelayed<ColourParameterEntityStruct>(id);
|
||||
entitiesDB.PublishEntityChange<ColourParameterEntityStruct>(id);
|
||||
}
|
||||
|
||||
public bool BlockExists(EGID blockID)
|
||||
|
|
@ -173,22 +172,23 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
public SimBody[] GetSimBodiesFromID(byte id)
|
||||
{
|
||||
var ret = new FasterList<SimBody>(4);
|
||||
var oids = entitiesDB.QueryEntitiesOptional<ObjectIdEntityStruct>(ObjectIDBlockExclusiveGroups.OBJECT_ID_BLOCK_GROUP);
|
||||
var (oids, tags, count) = entitiesDB.QueryEntities<ObjectIdEntityStruct, BlockTagEntityStruct>(ObjectIDBlockExclusiveGroups.OBJECT_ID_BLOCK_GROUP);
|
||||
EGIDMapper<GridConnectionsEntityStruct>? connections = null;
|
||||
foreach (var oid in oids)
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
if (oid.Get().objectId != id) continue;
|
||||
if (oids[i].objectId != id) continue;
|
||||
var tag = tags[i];
|
||||
if (!connections.HasValue) //Would need reflection to get the group from the build group otherwise
|
||||
connections = entitiesDB.QueryMappedEntities<GridConnectionsEntityStruct>(oid.EGID.groupID);
|
||||
//var rid = connections.Value.Entity(tag.ID.entityID).machineRigidBodyId;
|
||||
/*foreach (var rb in ret) - TODO
|
||||
connections = entitiesDB.QueryMappedEntities<GridConnectionsEntityStruct>(tag.ID.groupID);
|
||||
var rid = connections.Value.Entity(tag.ID.entityID).machineRigidBodyId;
|
||||
foreach (var rb in ret)
|
||||
{
|
||||
if (rb.Id.entityID == rid)
|
||||
goto DUPLICATE; //Multiple Object Identifiers on one rigid body
|
||||
}
|
||||
|
||||
ret.Add(new SimBody(rid));
|
||||
DUPLICATE: ;*/
|
||||
DUPLICATE: ;
|
||||
}
|
||||
|
||||
return ret.ToArray();
|
||||
|
|
@ -202,8 +202,8 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
{
|
||||
ref var joint = ref joints[i];
|
||||
if (joint.isBroken) continue;
|
||||
/*if (joint.connectedEntityA == id) list.Add(new SimBody(joint.connectedEntityB)); - TODO:
|
||||
else if (joint.connectedEntityB == id) list.Add(new SimBody(joint.connectedEntityA));*/
|
||||
if (joint.connectedEntityA == id) list.Add(new SimBody(joint.connectedEntityB));
|
||||
else if (joint.connectedEntityB == id) list.Add(new SimBody(joint.connectedEntityA));
|
||||
}
|
||||
|
||||
return list.ToArray();
|
||||
|
|
@ -218,8 +218,8 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
for (var index = 0; index < count; index++)
|
||||
{
|
||||
var conn = coll[index];
|
||||
/*if (conn.clusterId == cid) - TODO
|
||||
bodies.Add(conn.machineRigidBodyId);*/
|
||||
if (conn.clusterId == cid)
|
||||
bodies.Add(conn.machineRigidBodyId);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -247,8 +247,8 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
{
|
||||
var conn = coll[index];
|
||||
//Static blocks don't have a cluster ID but the cluster destruction manager should have one
|
||||
/*if (conn.machineRigidBodyId == sbid && conn.clusterId != uint.MaxValue) - TODO:
|
||||
return new Cluster(conn.clusterId);*/
|
||||
if (conn.machineRigidBodyId == sbid && conn.clusterId != uint.MaxValue)
|
||||
return new Cluster(conn.clusterId);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -265,8 +265,8 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
for (var index = 0; index < count; index++)
|
||||
{
|
||||
var conn = coll[index];
|
||||
/*if (conn.machineRigidBodyId == sbid) - TODO
|
||||
set.Add(Block.New(tags[index].ID));*/
|
||||
if (conn.machineRigidBodyId == sbid)
|
||||
set.Add(Block.New(tags[index].ID));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -279,11 +279,11 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
return Array.Empty<ObjectID>();
|
||||
|
||||
var ret = new FasterList<ObjectID>(4);
|
||||
var oids = entitiesDB.QueryEntitiesOptional<ObjectIDTweakableComponent>(ObjectIDBlockExclusiveGroups.OBJECT_ID_BLOCK_GROUP);
|
||||
foreach (var oid in oids)
|
||||
var (oids, tags, count) = entitiesDB.QueryEntities<ObjectIDTweakableComponent, BlockTagEntityStruct>(ObjectIDBlockExclusiveGroups.OBJECT_ID_BLOCK_GROUP);
|
||||
for (var index = 0; index < count; index++)
|
||||
{
|
||||
if (oid.Get().objectIDToTrigger == id)
|
||||
ret.Add(new ObjectID(oid.EGID));
|
||||
if (oids[index].objectIDToTrigger == id)
|
||||
ret.Add(new ObjectID(tags[index].ID));
|
||||
}
|
||||
|
||||
return ret.ToArray();
|
||||
|
|
|
|||
|
|
@ -18,10 +18,9 @@ using Svelto.ECS.DataStructures;
|
|||
using Svelto.ECS.EntityStructs;
|
||||
using Svelto.ECS.Native;
|
||||
using Svelto.ECS.Serialization;
|
||||
using Techblox.Blocks.Connections;
|
||||
using Techblox.Blocks;
|
||||
using TechbloxModdingAPI.Engines;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
using TechbloxModdingAPI.Utility.ECS;
|
||||
using Unity.Collections;
|
||||
using Unity.Mathematics;
|
||||
using UnityEngine;
|
||||
|
|
@ -49,8 +48,7 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
private static readonly MethodInfo SerializeGhostBlueprint =
|
||||
AccessTools.Method(SerializeGhostBlueprintType, "SerializeClipboardGhostEntities");
|
||||
|
||||
private static NativeEntityRemove nativeBlockRemove;
|
||||
private static NativeEntityRemove nativeConnectionRemove;
|
||||
private static NativeEntityRemove nativeRemove;
|
||||
private static MachineGraphConnectionEntityFactory connectionFactory;
|
||||
private static IEntityFunctions entityFunctions;
|
||||
private static ClipboardSerializationDataResourceManager clipboardManager;
|
||||
|
|
@ -90,8 +88,8 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
|
||||
public void RemoveBlockGroup(int id)
|
||||
{
|
||||
BlockGroupUtility.RemoveAllBlocksInBlockGroup(id, entitiesDB, removedConnections, nativeBlockRemove,
|
||||
nativeConnectionRemove, connectionFactory, default).Complete();
|
||||
BlockGroupUtility.RemoveAllBlocksInBlockGroup(id, entitiesDB, removedConnections, nativeRemove,
|
||||
connectionFactory, default).Complete();
|
||||
}
|
||||
|
||||
public int CreateBlockGroup(float3 position, quaternion rotation)
|
||||
|
|
@ -341,8 +339,7 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
public static void Prefix(IEntityFunctions entityFunctions,
|
||||
MachineGraphConnectionEntityFactory machineGraphConnectionEntityFactory)
|
||||
{
|
||||
nativeBlockRemove = entityFunctions.ToNativeRemove<BlockEntityDescriptor>("TBAPI" + nameof(BlueprintEngine));
|
||||
nativeConnectionRemove = entityFunctions.ToNativeRemove<MachineConnectionEntityDescriptor>("TBAPI" + nameof(BlueprintEngine));
|
||||
nativeRemove = entityFunctions.ToNativeRemove<BlockEntityDescriptor>("GCAPI" + nameof(BlueprintEngine));
|
||||
connectionFactory = machineGraphConnectionEntityFactory;
|
||||
BlueprintEngine.entityFunctions = entityFunctions;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ using Unity.Transforms;
|
|||
|
||||
using TechbloxModdingAPI.Engines;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
using TechbloxModdingAPI.Utility.ECS;
|
||||
|
||||
namespace TechbloxModdingAPI.Blocks.Engines
|
||||
{
|
||||
|
|
@ -57,7 +56,7 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
});
|
||||
}
|
||||
|
||||
entitiesDB.QueryEntityOrDefault<GridConnectionsEntityStruct>(block).areConnectionsAssigned = false;
|
||||
entitiesDB.QueryEntityOrDefault<GridConnectionsEntityStruct>(block).isProcessed = false;
|
||||
return posStruct.position;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ using Unity.Mathematics;
|
|||
|
||||
using TechbloxModdingAPI.Engines;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
using TechbloxModdingAPI.Utility.ECS;
|
||||
|
||||
namespace TechbloxModdingAPI.Blocks.Engines
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,61 +1,47 @@
|
|||
using System.Reflection;
|
||||
|
||||
using Gamecraft.Blocks.BlockGroups;
|
||||
using HarmonyLib;
|
||||
using RobocraftX.Blocks;
|
||||
using RobocraftX.Common;
|
||||
using RobocraftX.GroupTags;
|
||||
using RobocraftX.StateSync;
|
||||
using Svelto.Common;
|
||||
using Svelto.ECS;
|
||||
using Svelto.ECS.Native;
|
||||
using Techblox.Blocks.Connections;
|
||||
using Unity.Collections;
|
||||
using Unity.Jobs;
|
||||
using Allocator = Unity.Collections.Allocator;
|
||||
|
||||
using TechbloxModdingAPI.Engines;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
|
||||
namespace TechbloxModdingAPI.Blocks.Engines
|
||||
{
|
||||
public class RemovalEngine : IApiEngine, IDeterministicTimeStopped
|
||||
public class RemovalEngine : IApiEngine
|
||||
{
|
||||
private static IEntityFunctions _entityFunctions;
|
||||
private static MachineGraphConnectionEntityFactory _connectionFactory;
|
||||
private NativeHashSet<ulong> removedConnections;
|
||||
|
||||
public bool RemoveBlock(EGID target)
|
||||
{
|
||||
if (!entitiesDB.Exists<MachineGraphConnectionsEntityStruct>(target))
|
||||
return false;
|
||||
using var connStructMapper =
|
||||
entitiesDB.QueryNativeMappedEntities<MachineGraphConnectionsEntityStruct>(GroupTag<BLOCK_TAG>.Groups,
|
||||
Svelto.Common.Allocator.Temp);
|
||||
if (entitiesDB.TryQueryNativeMappedEntities<MachineConnectionComponent>(
|
||||
ConnectionsExclusiveGroups.MACHINE_CONNECTION_GROUP, out var mapper))
|
||||
{
|
||||
BlockGroupUtility.RemoveBlockConnections(target, removedConnections, _connectionFactory,
|
||||
connStructMapper, mapper, entitiesDB.GetEntityReferenceMap(), _entityFunctions);
|
||||
}
|
||||
|
||||
var connections = entitiesDB.QueryEntity<MachineGraphConnectionsEntityStruct>(target);
|
||||
var groups = entitiesDB.FindGroups<MachineGraphConnectionsEntityStruct>();
|
||||
using var connStructMapper = //The allocator needs to be persistent because that's what is used in the Dispose() method
|
||||
entitiesDB.QueryNativeMappedEntities<MachineGraphConnectionsEntityStruct>(groups, Allocator.Persistent);
|
||||
for (int i = connections.connections.Count<MachineConnectionStruct>() - 1; i >= 0; i--)
|
||||
_connectionFactory.RemoveConnection(connections, i, connStructMapper);
|
||||
_entityFunctions.RemoveEntity<BlockEntityDescriptor>(target);
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Ready()
|
||||
{
|
||||
removedConnections = new(2000, Allocator.Persistent);
|
||||
}
|
||||
|
||||
public EntitiesDB entitiesDB { get; set; }
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
removedConnections.Dispose();
|
||||
}
|
||||
|
||||
public string Name => "TechbloxModdingAPIRemovalGameEngine";
|
||||
public string name => Name;
|
||||
public string Name { get; } = "TechbloxModdingAPIRemovalGameEngine";
|
||||
|
||||
public bool isRemovable => false;
|
||||
|
||||
|
|
@ -75,12 +61,5 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
return AccessTools.TypeByName("RobocraftX.CR.MachineEditing.RemoveBlockEngine").GetConstructors()[0];
|
||||
}
|
||||
}
|
||||
|
||||
public JobHandle DeterministicStep(in float deltaTime, JobHandle inputDeps)
|
||||
{
|
||||
if (removedConnections.IsCreated)
|
||||
removedConnections.Clear();
|
||||
return default;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7,7 +7,6 @@ using UnityEngine;
|
|||
|
||||
using TechbloxModdingAPI.Engines;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
using TechbloxModdingAPI.Utility.ECS;
|
||||
|
||||
namespace TechbloxModdingAPI.Blocks.Engines
|
||||
{
|
||||
|
|
@ -60,9 +59,7 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
});
|
||||
}
|
||||
|
||||
// TODO: Connections probably need to be assigned (maybe)
|
||||
// They are assigned during machine processing anyway
|
||||
entitiesDB.QueryEntityOrDefault<GridConnectionsEntityStruct>(block).areConnectionsAssigned = false;
|
||||
entitiesDB.QueryEntityOrDefault<GridConnectionsEntityStruct>(block).isProcessed = false;
|
||||
return ((Quaternion)rotStruct.rotation).eulerAngles;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ using Svelto.ECS;
|
|||
|
||||
using TechbloxModdingAPI.Engines;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
using TechbloxModdingAPI.Utility.ECS;
|
||||
|
||||
namespace TechbloxModdingAPI.Blocks.Engines
|
||||
{
|
||||
|
|
@ -42,7 +41,7 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
|
||||
// implementations for block wiring
|
||||
|
||||
public (WireEntityStruct Wire, EGID ID) CreateNewWire(EGID startBlock, byte startPort, EGID endBlock, byte endPort)
|
||||
public WireEntityStruct CreateNewWire(EGID startBlock, byte startPort, EGID endBlock, byte endPort)
|
||||
{
|
||||
EGID wireEGID = new EGID(BuildModeWiresGroups.NewWireEntityId, BuildModeWiresGroups.WiresGroup.Group);
|
||||
EntityInitializer wireInitializer = Factory.BuildEntity<WireEntityDescriptor>(wireEGID);
|
||||
|
|
@ -51,9 +50,10 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
sourceBlockEGID = startBlock,
|
||||
sourcePortUsage = startPort,
|
||||
destinationBlockEGID = endBlock,
|
||||
destinationPortUsage = endPort
|
||||
destinationPortUsage = endPort,
|
||||
ID = wireEGID
|
||||
});
|
||||
return (wireInitializer.Get<WireEntityStruct>(), wireEGID);
|
||||
return wireInitializer.Get<WireEntityStruct>();
|
||||
}
|
||||
|
||||
public ref WireEntityStruct GetWire(EGID wire)
|
||||
|
|
@ -226,27 +226,27 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
uint entityID = (output ? ports.firstOutputID : ports.firstInputID) + i;
|
||||
if (!mapper.TryGetArrayAndEntityIndex(entityID, out var index, out var array) ||
|
||||
array[index].usage != portUsage) continue;
|
||||
return new OptionalRef<PortEntityStruct>(array, index, new EGID(entityID, group));
|
||||
return new OptionalRef<PortEntityStruct>(array, index);
|
||||
}
|
||||
|
||||
return default;
|
||||
}
|
||||
|
||||
public OptionalRef<WireEntityStruct> MatchPortToWire(PortEntityStruct port, EGID blockID, out EGID wireID)
|
||||
public ref WireEntityStruct MatchPortToWire(PortEntityStruct port, EGID blockID, out bool exists)
|
||||
{
|
||||
var (wires, ids, count) = entitiesDB.QueryEntities<WireEntityStruct>(NamedExclusiveGroup<BuildModeWiresGroups.WiresGroup>.Group);
|
||||
var (wires, count) = entitiesDB.QueryEntities<WireEntityStruct>(NamedExclusiveGroup<BuildModeWiresGroups.WiresGroup>.Group);
|
||||
for (uint i = 0; i < count; i++)
|
||||
{
|
||||
if ((wires[i].destinationPortUsage == port.usage && wires[i].destinationBlockEGID == blockID)
|
||||
|| (wires[i].sourcePortUsage == port.usage && wires[i].sourceBlockEGID == blockID))
|
||||
{
|
||||
wireID = new EGID(ids[i], BuildModeWiresGroups.WiresGroup.Group);
|
||||
return new OptionalRef<WireEntityStruct>(wires, i);
|
||||
exists = true;
|
||||
return ref wires[i];
|
||||
}
|
||||
}
|
||||
|
||||
wireID = default;
|
||||
return default;
|
||||
exists = false;
|
||||
WireEntityStruct[] defRef = new WireEntityStruct[1];
|
||||
return ref defRef[0];
|
||||
}
|
||||
|
||||
public EGID MatchBlocksToWire(EGID startBlock, EGID endBlock, byte startPort = byte.MaxValue, byte endPort = byte.MaxValue)
|
||||
|
|
@ -275,20 +275,19 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
endPorts = new EGID[] {new EGID(ports.firstInputID + endPort, NamedExclusiveGroup<BuildModeWiresGroups.InputPortsGroup>.Group) };
|
||||
}
|
||||
|
||||
var (wires, count) = entitiesDB.QueryEntities<WireEntityStruct>(NamedExclusiveGroup<BuildModeWiresGroups.WiresGroup>.Group);
|
||||
for (int endIndex = 0; endIndex < endPorts.Length; endIndex++)
|
||||
{
|
||||
PortEntityStruct endPES = entitiesDB.QueryEntity<PortEntityStruct>(endPorts[endIndex]);
|
||||
for (int startIndex = 0; startIndex < startPorts.Length; startIndex++)
|
||||
{
|
||||
PortEntityStruct startPES = entitiesDB.QueryEntity<PortEntityStruct>(startPorts[startIndex]);
|
||||
foreach (var wireOpt in entitiesDB.QueryEntitiesOptional<WireEntityStruct>(
|
||||
NamedExclusiveGroup<BuildModeWiresGroups.WiresGroup>.Group))
|
||||
for (int w = 0; w < count; w++)
|
||||
{
|
||||
var wire = wireOpt.Get();
|
||||
if ((wire.destinationPortUsage == endPES.usage && wire.destinationBlockEGID == endBlock)
|
||||
&& (wire.sourcePortUsage == startPES.usage && wire.sourceBlockEGID == startBlock))
|
||||
if ((wires[w].destinationPortUsage == endPES.usage && wires[w].destinationBlockEGID == endBlock)
|
||||
&& (wires[w].sourcePortUsage == startPES.usage && wires[w].sourceBlockEGID == startBlock))
|
||||
{
|
||||
return wireOpt.EGID;
|
||||
return wires[w].ID;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -309,12 +308,12 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
public EGID[] GetElectricBlocks()
|
||||
{
|
||||
var res = new FasterList<EGID>();
|
||||
foreach (var ((coll, ids, count), _) in entitiesDB.QueryEntities<BlockPortsStruct>())
|
||||
foreach (var ((coll, count), _) in entitiesDB.QueryEntities<BlockPortsStruct>())
|
||||
{
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
ref BlockPortsStruct s = ref coll[i];
|
||||
//res.Add(s.ID); - TODO: Would need to search for the groups for each block
|
||||
res.Add(s.ID);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -323,18 +322,42 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
|
||||
public EGID[] WiredToInput(EGID block, byte port)
|
||||
{
|
||||
return entitiesDB
|
||||
.QueryEntitiesOptional<WireEntityStruct>(NamedExclusiveGroup<BuildModeWiresGroups.WiresGroup>.Group)
|
||||
.ToArray(wire => wire.ID,
|
||||
wire => wire.Component.destinationPortUsage == port && wire.Component.destinationBlockEGID == block);
|
||||
WireEntityStruct[] wireEntityStructs = Search(NamedExclusiveGroup<BuildModeWiresGroups.WiresGroup>.Group,
|
||||
(WireEntityStruct wes) => wes.destinationPortUsage == port && wes.destinationBlockEGID == block);
|
||||
EGID[] result = new EGID[wireEntityStructs.Length];
|
||||
for (uint i = 0; i < wireEntityStructs.Length; i++)
|
||||
{
|
||||
result[i] = wireEntityStructs[i].ID;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public EGID[] WiredToOutput(EGID block, byte port)
|
||||
{
|
||||
return entitiesDB
|
||||
.QueryEntitiesOptional<WireEntityStruct>(NamedExclusiveGroup<BuildModeWiresGroups.WiresGroup>.Group)
|
||||
.ToArray(wire => wire.ID,
|
||||
wire => wire.Component.sourcePortUsage == port && wire.Component.sourceBlockEGID == block);
|
||||
WireEntityStruct[] wireEntityStructs = Search(NamedExclusiveGroup<BuildModeWiresGroups.WiresGroup>.Group,
|
||||
(WireEntityStruct wes) => wes.sourcePortUsage == port && wes.sourceBlockEGID == block);
|
||||
EGID[] result = new EGID[wireEntityStructs.Length];
|
||||
for (uint i = 0; i < wireEntityStructs.Length; i++)
|
||||
{
|
||||
result[i] = wireEntityStructs[i].ID;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private T[] Search<T>(ExclusiveGroup group, Func<T, bool> isMatch) where T : unmanaged, IEntityComponent
|
||||
{
|
||||
FasterList<T> results = new FasterList<T>();
|
||||
var (components, count) = entitiesDB.QueryEntities<T>(group);
|
||||
for (uint i = 0; i < count; i++)
|
||||
{
|
||||
if (isMatch(components[i]))
|
||||
{
|
||||
results.Add(components[i]);
|
||||
}
|
||||
}
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private EntityCollection<ChannelDataStruct> GetSignalStruct(uint signalID, out uint index, bool input = true)
|
||||
|
|
@ -344,7 +367,7 @@ namespace TechbloxModdingAPI.Blocks.Engines
|
|||
: NamedExclusiveGroup<BuildModeWiresGroups.OutputPortsGroup>.Group;
|
||||
if (entitiesDB.Exists<PortEntityStruct>(signalID, group))
|
||||
{
|
||||
index = entitiesDB.QueryEntity<PortEntityStruct>(signalID, group).firstChannelIndexCachedInSim;
|
||||
index = entitiesDB.QueryEntity<PortEntityStruct>(signalID, group).anyChannelIndex;
|
||||
var channelData =
|
||||
entitiesDB.QueryEntities<ChannelDataStruct>(NamedExclusiveGroup<BuildModeWiresGroups.ChannelDataGroup>.Group);
|
||||
return channelData;
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).servoVelocity;
|
||||
return BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).servoVelocity;
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).servoVelocity = value;
|
||||
BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).servoVelocity = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -45,11 +45,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).minDeviation;
|
||||
return BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).minDeviation;
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).minDeviation = value;
|
||||
BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).minDeviation = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -60,11 +60,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).maxDeviation;
|
||||
return BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).maxDeviation;
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).maxDeviation = value;
|
||||
BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).maxDeviation = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -75,11 +75,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).reverse;
|
||||
return BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).reverse;
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).reverse = value;
|
||||
BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).reverse = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -90,11 +90,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).hasProportionalInput;
|
||||
return BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).hasProportionalInput;
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).hasProportionalInput = value;
|
||||
BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).hasProportionalInput = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -105,11 +105,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).directionVector;
|
||||
return BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).directionVector;
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).directionVector = value;
|
||||
BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).directionVector = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -120,11 +120,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).rotationAxis;
|
||||
return BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).rotationAxis;
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).rotationAxis = value;
|
||||
BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).rotationAxis = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -135,11 +135,11 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
get
|
||||
{
|
||||
return BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).forceAxis;
|
||||
return BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).forceAxis;
|
||||
}
|
||||
set
|
||||
{
|
||||
BlockEngine.GetBlockInfo<Techblox.ServoBlocksServer.ServoReadOnlyTweakableComponent>(this).forceAxis = value;
|
||||
BlockEngine.GetBlockInfo<RobocraftX.Blocks.ServoReadOnlyStruct>(this).forceAxis = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@ namespace TechbloxModdingAPI.Blocks
|
|||
/// <returns>The connected wire.</returns>
|
||||
/// <param name="portId">Port identifier.</param>
|
||||
/// <param name="connected">Whether the port has a wire connected to it.</param>
|
||||
protected OptionalRef<WireEntityStruct> GetConnectedWire(PortEntityStruct port, out EGID egid)
|
||||
protected ref WireEntityStruct GetConnectedWire(PortEntityStruct port, out bool connected)
|
||||
{
|
||||
return SignalEngine.MatchPortToWire(port, Id, out egid);
|
||||
return ref SignalEngine.MatchPortToWire(port, Id, out connected);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ using Svelto.ECS;
|
|||
using Svelto.ECS.Experimental;
|
||||
|
||||
using TechbloxModdingAPI.Blocks.Engines;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
|
||||
namespace TechbloxModdingAPI.Blocks
|
||||
{
|
||||
|
|
@ -31,8 +30,8 @@ namespace TechbloxModdingAPI.Blocks
|
|||
|
||||
public static Wire Connect(SignalingBlock start, byte startPort, SignalingBlock end, byte endPort)
|
||||
{
|
||||
var (wire, id) = signalEngine.CreateNewWire(start.Id, startPort, end.Id, endPort);
|
||||
return new Wire(wire, start, end, id);
|
||||
WireEntityStruct wire = signalEngine.CreateNewWire(start.Id, startPort, end.Id, endPort);
|
||||
return new Wire(wire, start, end);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -46,9 +45,9 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
var port = signalEngine.MatchBlockIOToPort(end, endPort, false);
|
||||
if (!port) return null;
|
||||
var wire = signalEngine.MatchPortToWire(port, end.Id, out var egid);
|
||||
return wire
|
||||
? new Wire(wire.Get().sourceBlockEGID, end.Id, wire.Get().sourcePortUsage, endPort, egid, false)
|
||||
WireEntityStruct wire = signalEngine.MatchPortToWire(port, end.Id, out var exists);
|
||||
return exists
|
||||
? new Wire(wire.sourceBlockEGID, end.Id, wire.sourcePortUsage, endPort, wire.ID, false)
|
||||
: null;
|
||||
}
|
||||
|
||||
|
|
@ -63,9 +62,9 @@ namespace TechbloxModdingAPI.Blocks
|
|||
{
|
||||
var port = signalEngine.MatchBlockIOToPort(start, startPort, true);
|
||||
if (!port) return null;
|
||||
var wire = signalEngine.MatchPortToWire(port, start.Id, out var egid);
|
||||
return wire
|
||||
? new Wire(start.Id, wire.Get().destinationBlockEGID, startPort, wire.Get().destinationPortUsage, egid, false)
|
||||
WireEntityStruct wire = signalEngine.MatchPortToWire(port, start.Id, out var exists);
|
||||
return exists
|
||||
? new Wire(start.Id, wire.destinationBlockEGID, startPort, wire.destinationPortUsage, wire.ID, false)
|
||||
: null;
|
||||
}
|
||||
|
||||
|
|
@ -133,9 +132,9 @@ namespace TechbloxModdingAPI.Blocks
|
|||
this.endBlockEGID = endBlock;
|
||||
this.inputToOutput = inputToOutput;
|
||||
this.wireEGID = wire;
|
||||
endPortEGID = signalEngine.MatchBlockIOToPort(startBlock, startPort, inputToOutput).EGID;
|
||||
endPortEGID = signalEngine.MatchBlockIOToPort(startBlock, startPort, inputToOutput).Nullable()?.ID ?? default;
|
||||
if (endPortEGID == default) throw new WireInvalidException("Wire end port not found");
|
||||
startPortEGID = signalEngine.MatchBlockIOToPort(endBlock, endPort, !inputToOutput).EGID;
|
||||
startPortEGID = signalEngine.MatchBlockIOToPort(endBlock, endPort, !inputToOutput).Nullable()?.ID ?? default;
|
||||
if (startPortEGID == default) throw new WireInvalidException("Wire start port not found");
|
||||
this.startPort = startPort;
|
||||
this.endPort = endPort;
|
||||
|
|
@ -152,8 +151,8 @@ namespace TechbloxModdingAPI.Blocks
|
|||
wireEgid, false);
|
||||
}
|
||||
|
||||
private Wire(WireEntityStruct wire, SignalingBlock src, SignalingBlock dest, EGID wireEgid)
|
||||
: this(src, dest, wire.sourcePortUsage, wire.destinationPortUsage, wireEgid, false)
|
||||
private Wire(WireEntityStruct wire, SignalingBlock src, SignalingBlock dest)
|
||||
: this(src, dest, wire.sourcePortUsage, wire.destinationPortUsage, wire.ID, false)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
using Svelto.ECS;
|
||||
using Techblox.TimeRunning.Clusters;
|
||||
using Gamecraft.Damage;
|
||||
using RobocraftX.Common;
|
||||
using Svelto.ECS;
|
||||
using Techblox.Physics;
|
||||
|
||||
namespace TechbloxModdingAPI
|
||||
{
|
||||
|
|
@ -13,26 +15,26 @@ namespace TechbloxModdingAPI
|
|||
{
|
||||
}
|
||||
|
||||
public Cluster(uint id) : this(new EGID(id, ClustersExclusiveGroups.SIMULATION_CLUSTERS_GROUP))
|
||||
public Cluster(uint id) : this(new EGID(id, CommonExclusiveGroups.SIMULATION_CLUSTERS_GROUP))
|
||||
{
|
||||
}
|
||||
|
||||
public float InitialHealth //TODO
|
||||
public float InitialHealth
|
||||
{
|
||||
get => 0f;
|
||||
set { }
|
||||
get => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).initialHealth;
|
||||
set => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).initialHealth = value;
|
||||
}
|
||||
|
||||
public float CurrentHealth
|
||||
{
|
||||
get => 0f;
|
||||
set { }
|
||||
get => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).currentHealth;
|
||||
set => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).currentHealth = value;
|
||||
}
|
||||
|
||||
public float HealthMultiplier
|
||||
{
|
||||
get => 0f;
|
||||
set { }
|
||||
get => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).healthMultiplier;
|
||||
set => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).healthMultiplier = value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ namespace TechbloxModdingAPI
|
|||
}
|
||||
Scheduler.Dispose();
|
||||
var currentAssembly = Assembly.GetExecutingAssembly();
|
||||
harmony.UnpatchSelf();
|
||||
harmony.UnpatchAll(currentAssembly.GetName().Name);
|
||||
harmony = null;
|
||||
Logging.MetaLog($"{currentAssembly.GetName().Name} v{currentAssembly.GetName().Version} shutdown");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using Gamecraft.Wires;
|
||||
using RobocraftX.Blocks.Ghost;
|
||||
using RobocraftX.Character;
|
||||
using RobocraftX.Character.Movement;
|
||||
using Unity.Mathematics;
|
||||
|
|
@ -10,7 +11,6 @@ using RobocraftX.Physics;
|
|||
using Svelto.ECS;
|
||||
using Techblox.BuildingDrone;
|
||||
using Techblox.Camera;
|
||||
using Techblox.Character;
|
||||
using TechbloxModdingAPI.Blocks;
|
||||
using TechbloxModdingAPI.Players;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
|
|
@ -214,16 +214,15 @@ namespace TechbloxModdingAPI
|
|||
/// The player's initial health when entering Simulation (aka Time Running) mode.
|
||||
/// </summary>
|
||||
/// <value>The initial health.</value>
|
||||
[Obsolete("We can no longer get initial health, returns max health.")]
|
||||
public float InitialHealth
|
||||
{
|
||||
get
|
||||
{
|
||||
var opt = playerEngine.GetCharacterStruct<CharacterHealthEntityComponent>(Id);
|
||||
return opt ? opt.Get().maxHealth : -1f;
|
||||
var opt = playerEngine.GetCharacterStruct<CharacterHealthEntityStruct>(Id);
|
||||
return opt ? opt.Get().initialHealth : -1f;
|
||||
}
|
||||
|
||||
set => playerEngine.GetCharacterStruct<CharacterHealthEntityComponent>(Id).Get().maxHealth = value;
|
||||
set => playerEngine.GetCharacterStruct<CharacterHealthEntityStruct>(Id).Get().initialHealth = value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -234,25 +233,30 @@ namespace TechbloxModdingAPI
|
|||
{
|
||||
get
|
||||
{
|
||||
var opt = playerEngine.GetCharacterStruct<CharacterHealthEntityComponent>(Id);
|
||||
var opt = playerEngine.GetCharacterStruct<CharacterHealthEntityStruct>(Id);
|
||||
return opt ? opt.Get().currentHealth : -1f;
|
||||
}
|
||||
|
||||
set => playerEngine.GetCharacterStruct<CharacterHealthEntityComponent>(Id).Get().currentHealth = value;
|
||||
set => playerEngine.GetCharacterStruct<CharacterHealthEntityStruct>(Id).Get().currentHealth = value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Whether this <see cref="T:TechbloxModdingAPI.Player"/> is damageable.
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if damageable; otherwise, <c>false</c>.</value>
|
||||
[Obsolete("Players are probably always damageable")]
|
||||
public bool Damageable
|
||||
{
|
||||
get => true;
|
||||
get
|
||||
{
|
||||
var opt = playerEngine.GetCharacterStruct<CharacterHealthEntityStruct>(Id);
|
||||
return opt.Get().canTakeDamageStat;
|
||||
}
|
||||
|
||||
// ReSharper disable once ValueParameterNotUsed
|
||||
set
|
||||
{
|
||||
ref var healthStruct = ref playerEngine.GetCharacterStruct<CharacterHealthEntityStruct>(Id).Get();
|
||||
healthStruct.canTakeDamage = value;
|
||||
healthStruct.canTakeDamageStat = value;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -260,26 +264,30 @@ namespace TechbloxModdingAPI
|
|||
/// The player's lives when initially entering Simulation (aka Time Running) mode.
|
||||
/// </summary>
|
||||
/// <value>The initial lives.</value>
|
||||
[Obsolete("The player has infinite lives")]
|
||||
public uint InitialLives
|
||||
{
|
||||
get => uint.MaxValue;
|
||||
get
|
||||
{
|
||||
var opt = playerEngine.GetCharacterStruct<CharacterLivesEntityComponent>(Id);
|
||||
return opt ? opt.Get().initialLives : uint.MaxValue;
|
||||
}
|
||||
|
||||
// ReSharper disable once ValueParameterNotUsed
|
||||
set { }
|
||||
set => playerEngine.GetCharacterStruct<CharacterLivesEntityComponent>(Id).Get().initialLives = value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The player's current lives in Simulation (aka Time Running) mode.
|
||||
/// </summary>
|
||||
/// <value>The current lives.</value>
|
||||
[Obsolete("The player has infinite lives")]
|
||||
public uint CurrentLives
|
||||
{
|
||||
get => uint.MaxValue;
|
||||
get
|
||||
{
|
||||
var opt = playerEngine.GetCharacterStruct<CharacterLivesEntityComponent>(Id);
|
||||
return opt ? opt.Get().currentLives : uint.MaxValue;
|
||||
}
|
||||
|
||||
// ReSharper disable once ValueParameterNotUsed
|
||||
set { }
|
||||
set => playerEngine.GetCharacterStruct<CharacterLivesEntityComponent>(Id).Get().currentLives = value;
|
||||
}
|
||||
|
||||
/*/// <summary>
|
||||
|
|
@ -365,9 +373,6 @@ namespace TechbloxModdingAPI
|
|||
var group when group == CharacterExclusiveGroups.MachineSpawningGroup => PlayerState.HoldingMachine,
|
||||
var group when group == CharacterExclusiveGroups.OnFootGroup => PlayerState.OnFoot,
|
||||
var group when group == CharacterExclusiveGroups.InPilotSeatGroup => PlayerState.InSeat,
|
||||
var group when group == CharacterExclusiveGroups.DyingOnFootGroup => PlayerState.OnFoot,
|
||||
var group when group == CharacterExclusiveGroups.DyingInPilotSeatGroup => PlayerState.InSeat,
|
||||
var group when group == CharacterExclusiveGroups.DeadGroup => PlayerState.OnFoot,
|
||||
_ => throw new ArgumentOutOfRangeException("", "Unknown player state")
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ using Techblox.Character;
|
|||
using TechbloxModdingAPI.Engines;
|
||||
using TechbloxModdingAPI.Input;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
using TechbloxModdingAPI.Utility.ECS;
|
||||
|
||||
namespace TechbloxModdingAPI.Players
|
||||
{
|
||||
|
|
@ -116,7 +115,7 @@ namespace TechbloxModdingAPI.Players
|
|||
public bool IsDead(uint playerId)
|
||||
{
|
||||
if (entitiesDB == null) return true;
|
||||
return entitiesDB.Exists<RigidBodyEntityStruct>(playerId, CharacterExclusiveGroups.DeadGroup);
|
||||
return entitiesDB.Exists<RigidBodyEntityStruct>(playerId, CharacterExclusiveGroups.DeadCharacters);
|
||||
}
|
||||
|
||||
// reusable methods
|
||||
|
|
@ -165,9 +164,8 @@ namespace TechbloxModdingAPI.Players
|
|||
var opt = GetCameraStruct<PhysicCameraRayCastEntityStruct>(playerId);
|
||||
if (!opt) return default;
|
||||
PhysicCameraRayCastEntityStruct rayCast = opt;
|
||||
EGID physicCameraEgid = new EGID(playerId, CameraExclusiveGroups.PhysicCameraGroup);
|
||||
float distance = maxDistance < 0
|
||||
? GhostBlockUtils.GetBuildInteractionDistance(entitiesDB, rayCast, physicCameraEgid,
|
||||
? GhostBlockUtils.GetBuildInteractionDistance(entitiesDB, rayCast,
|
||||
GhostBlockUtils.GhostCastMethod.GhostCastProportionalToBlockSize)
|
||||
: maxDistance;
|
||||
if (rayCast.hit && rayCast.distance <= distance)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ using UnityEngine;
|
|||
using Gamecraft.Damage;
|
||||
using RobocraftX.Common;
|
||||
using RobocraftX.Physics;
|
||||
using Techblox.TimeRunning.Clusters;
|
||||
|
||||
namespace TechbloxModdingAPI
|
||||
{
|
||||
|
|
@ -21,7 +20,7 @@ namespace TechbloxModdingAPI
|
|||
/// </summary>
|
||||
public Cluster Cluster => cluster ??= clusterId == uint.MaxValue // Return cluster or if it's null then set it
|
||||
? Block.BlockEngine.GetCluster(Id.entityID) // If we don't have a clusterId set then get it from the game
|
||||
: GetInstance(new EGID(clusterId, ClustersExclusiveGroups.SIMULATION_CLUSTERS_GROUP),
|
||||
: GetInstance(new EGID(clusterId, CommonExclusiveGroups.SIMULATION_CLUSTERS_GROUP),
|
||||
egid => new Cluster(egid)); // Otherwise get the cluster from the ID
|
||||
|
||||
private Cluster cluster;
|
||||
|
|
@ -83,7 +82,7 @@ namespace TechbloxModdingAPI
|
|||
|
||||
public float3 CenterOfMass
|
||||
{
|
||||
get => 0f; //TODO
|
||||
get => Block.BlockEngine.GetBlockInfo<MassEntityStruct>(this).centreOfMass;
|
||||
//set => GetStruct().physicsMass.CenterOfMass = value;
|
||||
}
|
||||
|
||||
|
|
@ -94,20 +93,20 @@ namespace TechbloxModdingAPI
|
|||
|
||||
public float InitialHealth
|
||||
{
|
||||
get => 0f;
|
||||
set { }
|
||||
get => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).initialHealth;
|
||||
set => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).initialHealth = value;
|
||||
}
|
||||
|
||||
public float CurrentHealth
|
||||
{
|
||||
get => 0f;
|
||||
set { }
|
||||
get => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).currentHealth;
|
||||
set => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).currentHealth = value;
|
||||
}
|
||||
|
||||
public float HealthMultiplier
|
||||
{
|
||||
get => 0f;
|
||||
set { }
|
||||
get => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).healthMultiplier;
|
||||
set => Block.BlockEngine.GetBlockInfo<HealthEntityComponent>(this).healthMultiplier = value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,23 +1,64 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using BepInEx;
|
||||
using BepInEx.Bootstrap;
|
||||
using HarmonyLib;
|
||||
using RobocraftX.FrontEnd;
|
||||
using System.Text.RegularExpressions;
|
||||
using DataLoader;
|
||||
using TechbloxModdingAPI.App;
|
||||
using HarmonyLib;
|
||||
using IllusionInjector;
|
||||
// test
|
||||
using RobocraftX.FrontEnd;
|
||||
using ServiceLayer;
|
||||
using Unity.Mathematics;
|
||||
using UnityEngine;
|
||||
using Svelto.Tasks;
|
||||
using Svelto.Tasks.Lean;
|
||||
using TechbloxModdingAPI.Blocks;
|
||||
using TechbloxModdingAPI.Commands;
|
||||
using TechbloxModdingAPI.Players;
|
||||
using TechbloxModdingAPI.Tasks;
|
||||
using TechbloxModdingAPI.Utility;
|
||||
|
||||
namespace TechbloxModdingAPI.Tests
|
||||
{
|
||||
#if DEBUG // The API should be loaded by other plugins, but it can be used by itself for testing
|
||||
[BepInPlugin("org.exmods.TechbloxModdingAPIPluginTest", PluginInfo.PLUGIN_NAME, PluginInfo.PLUGIN_VERSION)]
|
||||
[BepInProcess("Techblox.exe")]
|
||||
public class TechbloxModdingAPIPluginTest : BaseUnityPlugin
|
||||
#if DEBUG
|
||||
// unused by design
|
||||
/// <summary>
|
||||
/// Modding API implemented as a standalone IPA Plugin.
|
||||
/// Ideally, TechbloxModdingAPI should be loaded by another mod; not itself
|
||||
/// </summary>
|
||||
class TechbloxModdingAPIPluginTest : IllusionPlugin.IEnhancedPlugin
|
||||
{
|
||||
private void Awake()
|
||||
|
||||
private static Harmony harmony { get; set; }
|
||||
|
||||
public override string Name { get; } = Assembly.GetExecutingAssembly().GetName().Name;
|
||||
|
||||
public override string Version { get; } = Assembly.GetExecutingAssembly().GetName().Version.ToString();
|
||||
|
||||
public string HarmonyID { get; } = "org.git.exmods.modtainers.techbloxmoddingapi";
|
||||
|
||||
public override void OnApplicationQuit()
|
||||
{
|
||||
Main.Shutdown();
|
||||
}
|
||||
|
||||
public override void OnApplicationStart()
|
||||
{
|
||||
FileLog.Reset();
|
||||
Harmony.DEBUG = true;
|
||||
Main.Init();
|
||||
Logging.MetaDebugLog($"Version group id {ApiExclusiveGroups.versionGroup}");
|
||||
// disable background music
|
||||
Logging.MetaDebugLog("Audio Mixers: " + string.Join(",", AudioTools.GetMixers()));
|
||||
//AudioTools.SetVolume(0.0f, "Music"); // The game now sets this from settings again after this is called :(
|
||||
|
||||
//Utility.VersionTracking.Enable();//(very) unstable
|
||||
|
||||
// debug/test handlers
|
||||
Client.EnterMenu += (sender, args) => throw new Exception("Test handler always throws an exception!");
|
||||
Client.EnterMenu += (sender, args) => Console.WriteLine("EnterMenu handler after erroring handler");
|
||||
Game.Enter += (s, a) =>
|
||||
|
|
@ -28,6 +69,9 @@ namespace TechbloxModdingAPI.Tests
|
|||
Console.WriteLine($"Player {Player.LocalPlayer} exited seat {args.Seat}");
|
||||
};
|
||||
|
||||
// debug/test commands
|
||||
if (Dependency.Hell("ExtraCommands"))
|
||||
{
|
||||
CommandBuilder.Builder()
|
||||
.Name("Exit")
|
||||
.Description("Close Techblox immediately, without any prompts")
|
||||
|
|
@ -40,31 +84,310 @@ namespace TechbloxModdingAPI.Tests
|
|||
.Action((float d) => { UnityEngine.Camera.main.fieldOfView = d; })
|
||||
.Build();
|
||||
|
||||
CommandBuilder.Builder()
|
||||
.Name("MoveLastBlock")
|
||||
.Description("Move the most-recently-placed block, and any connected blocks by the given offset")
|
||||
.Action((float x, float y, float z) =>
|
||||
{
|
||||
if (GameState.IsBuildMode())
|
||||
foreach (var block in Block.GetLastPlacedBlock().GetConnectedCubes())
|
||||
block.Position += new Unity.Mathematics.float3(x, y, z);
|
||||
else
|
||||
Logging.CommandLogError("Blocks can only be moved in Build mode!");
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder()
|
||||
.Name("PlaceAluminium")
|
||||
.Description("Place a block of aluminium at the given coordinates")
|
||||
.Action((float x, float y, float z) =>
|
||||
{
|
||||
var block = Block.PlaceNew(BlockIDs.Cube, new float3(x, y, z));
|
||||
Logging.CommandLog("Block placed with type: " + block.Type);
|
||||
})
|
||||
.Build();
|
||||
|
||||
CommandBuilder.Builder()
|
||||
.Name("PlaceAluminiumLots")
|
||||
.Description("Place a lot of blocks of aluminium at the given coordinates")
|
||||
.Action((float x, float y, float z) =>
|
||||
{
|
||||
Logging.CommandLog("Starting...");
|
||||
var sw = Stopwatch.StartNew();
|
||||
for (int i = 0; i < 100; i++)
|
||||
for (int j = 0; j < 100; j++)
|
||||
Block.PlaceNew(BlockIDs.Cube, new float3(x + i, y, z + j));
|
||||
sw.Stop();
|
||||
Logging.CommandLog("Finished in " + sw.ElapsedMilliseconds + "ms");
|
||||
})
|
||||
.Build();
|
||||
|
||||
Block b = null;
|
||||
CommandBuilder.Builder("moveBlockInSim", "Run in build mode first while looking at a block, then in sim to move it up")
|
||||
.Action(() =>
|
||||
{
|
||||
if (b == null)
|
||||
{
|
||||
b = new Player(PlayerType.Local).GetBlockLookedAt();
|
||||
Logging.CommandLog("Block saved: " + b);
|
||||
}
|
||||
else
|
||||
Logging.CommandLog("Block moved to: " + (b.GetSimBody().Position += new float3(0, 2, 0)));
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder("Error", "Throw an error to make sure SimpleCustomCommandEngine's wrapper catches it.")
|
||||
.Action(() => { throw new Exception("Error Command always throws an error"); })
|
||||
.Build();
|
||||
|
||||
CommandBuilder.Builder("ColorBlock",
|
||||
"Change color of the block looked at if there's any.")
|
||||
.Action<string>(str =>
|
||||
{
|
||||
if (!Enum.TryParse(str, out BlockColors color))
|
||||
{
|
||||
Logging.CommandLog("Color " + str + " not found! Interpreting as 4 color values.");
|
||||
var s = str.Split(' ');
|
||||
new Player(PlayerType.Local).GetBlockLookedAt().CustomColor = new float4(float.Parse(s[0]),
|
||||
float.Parse(s[1]), float.Parse(s[2]), float.Parse(s[3]));
|
||||
return;
|
||||
}
|
||||
|
||||
new Player(PlayerType.Local).GetBlockLookedAt().Color = color;
|
||||
Logging.CommandLog("Colored block to " + color);
|
||||
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder("MoveBlockByID", "Gets a block based on its object identifier and teleports it up.")
|
||||
.Action<char>(ch =>
|
||||
{
|
||||
foreach (var body in SimBody.GetFromObjectID(ch))
|
||||
{
|
||||
Logging.CommandLog("SimBody: " + body);
|
||||
body.Position += new float3(0, 10, 0);
|
||||
foreach (var bodyConnectedBody in body.GetConnectedBodies())
|
||||
{
|
||||
Logging.CommandLog("Moving " + bodyConnectedBody);
|
||||
bodyConnectedBody.Position += new float3(0, 10, 0);
|
||||
}
|
||||
}
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder("TestChunkHealth", "Sets the chunk looked at to the given health.")
|
||||
.Action((float val, float max) =>
|
||||
{
|
||||
var body = new Player(PlayerType.Local).GetSimBodyLookedAt();
|
||||
if (body == null) return;
|
||||
body.CurrentHealth = val;
|
||||
body.InitialHealth = max;
|
||||
Logging.CommandLog("Health set to: " + val);
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder("placeBlockGroup", "Places some blocks in a group")
|
||||
.Action((float x, float y, float z) =>
|
||||
{
|
||||
var pos = new float3(x, y, z);
|
||||
var group = BlockGroup.Create(new Block(BlockIDs.Cube, pos) {Color = BlockColors.Aqua});
|
||||
new Block(BlockIDs.Cube, pos += new float3(1, 0, 0))
|
||||
{Color = BlockColors.Blue, BlockGroup = group};
|
||||
new Block(BlockIDs.Cube, pos += new float3(1, 0, 0))
|
||||
{Color = BlockColors.Green, BlockGroup = group};
|
||||
new Block(BlockIDs.Cube, pos + new float3(1, 0, 0))
|
||||
{Color = BlockColors.Lime, BlockGroup = group};
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder("placeCustomBlock", "Places a custom block, needs a custom catalog and assets.")
|
||||
.Action((float x, float y, float z) =>
|
||||
{
|
||||
Logging.CommandLog("Block placed: " +
|
||||
Block.PlaceNew((BlockIDs) 500, new float3(0, 0, 0)));
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder("toggleTimeMode", "Enters or exits simulation.")
|
||||
.Action((float x, float y, float z) =>
|
||||
{
|
||||
Game.CurrentGame().ToggleTimeMode();
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder("testColorBlock", "Tests coloring a block to default color")
|
||||
.Action(() => Player.LocalPlayer.GetBlockLookedAt().Color = BlockColors.Default).Build();
|
||||
CommandBuilder.Builder("testMaterialBlock", "Tests materialing a block to default material")
|
||||
.Action(() => Player.LocalPlayer.GetBlockLookedAt().Material = BlockMaterial.Default).Build();
|
||||
CommandBuilder.Builder("testGameName", "Tests changing the game name")
|
||||
.Action(() => Game.CurrentGame().Name = "Test").Build();
|
||||
CommandBuilder.Builder("makeBlockStatic", "Makes a block you look at static")
|
||||
.Action(() => Player.LocalPlayer.GetBlockLookedAt().Static = true).Build();
|
||||
|
||||
Game.AddPersistentDebugInfo("InstalledMods", InstalledMods);
|
||||
/*Block.Placed += (sender, args) =>
|
||||
Logging.MetaDebugLog("Placed block " + args.Block);
|
||||
Block.Removed += (sender, args) =>
|
||||
Logging.MetaDebugLog("Removed block " + args.Block);*/
|
||||
}
|
||||
|
||||
// Plugin startup logic
|
||||
Logger.LogInfo($"Plugin {PluginInfo.PLUGIN_GUID} is loaded!");
|
||||
// dependency test
|
||||
if (Dependency.Hell("TechbloxScripting", new Version("0.0.1.0")))
|
||||
{
|
||||
Logging.LogWarning("You're in TechbloxScripting dependency hell");
|
||||
}
|
||||
else
|
||||
{
|
||||
Logging.Log("Compatible TechbloxScripting detected");
|
||||
}
|
||||
// Interface test
|
||||
/*Group uiGroup = new Group(new Rect(20, 20, 200, 500), "TechbloxModdingAPI_UITestGroup", true);
|
||||
var button = new Button("TEST");
|
||||
button.OnClick += (b, __) => { Logging.MetaDebugLog($"Click on {((Interface.IMGUI.Button)b).Name}");};
|
||||
var button2 = new Button("TEST2");
|
||||
button2.OnClick += (b, __) => { Logging.MetaDebugLog($"Click on {((Interface.IMGUI.Button)b).Name}");};
|
||||
Text uiText = new Text("<Input!>", multiline: true);
|
||||
uiText.OnEdit += (t, txt) => { Logging.MetaDebugLog($"Text in {((Text)t).Name} is now '{txt}'"); };
|
||||
Label uiLabel = new Label("Label!");
|
||||
Image uiImg = new Image(name:"Behold this texture!");
|
||||
uiImg.Enabled = false;
|
||||
uiGroup.AddElement(button);
|
||||
uiGroup.AddElement(button2);
|
||||
uiGroup.AddElement(uiText);
|
||||
uiGroup.AddElement(uiLabel);
|
||||
uiGroup.AddElement(uiImg);*/
|
||||
|
||||
/*Addressables.LoadAssetAsync<Texture2D>("Assets/Art/Textures/UI/FrontEndMap/RCX_Blue_Background_5k.jpg")
|
||||
.Completed +=
|
||||
handle =>
|
||||
{
|
||||
uiImg.Texture = handle.Result;
|
||||
uiImg.Enabled = true;
|
||||
Logging.MetaDebugLog($"Got blue bg asset {handle.Result}");
|
||||
};*/
|
||||
|
||||
/*((FasterList<GuiInputMap.GuiInputMapElement>)AccessTools.Property(typeof(GuiInputMap), "GuiInputsButtonDown").GetValue(null))
|
||||
.Add(new GuiInputMap.GuiInputMapElement(RewiredConsts.Action.ToggleCommandLine, GuiIn))*/
|
||||
|
||||
/*Game.Enter += (sender, e) =>
|
||||
{
|
||||
ushort lastKey = ushort.MaxValue;
|
||||
foreach (var kv in FullGameFields._dataDb.GetValues<CubeListData>()
|
||||
.OrderBy(kv=>ushort.Parse(kv.Key)))
|
||||
{
|
||||
var data = (CubeListData) kv.Value;
|
||||
ushort currentKey = ushort.Parse(kv.Key);
|
||||
var toReplace = new Dictionary<string, string>
|
||||
{
|
||||
{"Scalable", ""}, {"Qtr", "Quarter"}, {"RNeg", "Rounded Negative"},
|
||||
{"Neg", "Negative"}, {"Tetra", "Tetrahedron"},
|
||||
{"RWedge", "Rounded Wedge"}, {"RTetra", "Rounded Tetrahedron"}
|
||||
};
|
||||
string name = LocalizationService.Localize(data.CubeNameKey).Split(' ').Select(str =>
|
||||
str.Length > 0 ? char.ToUpper(str[0]) + str.Substring(1) : str).Aggregate((a, b) => a + b)
|
||||
.Replace("-", "");
|
||||
foreach (var rkv in toReplace)
|
||||
{
|
||||
name = Regex.Replace(name, rkv.Key + "([A-Z]|$)", rkv.Value + "$1");
|
||||
}
|
||||
Console.WriteLine($"{name}{(currentKey != lastKey + 1 ? $" = {currentKey}" : "")},");
|
||||
lastKey = currentKey;
|
||||
}
|
||||
};
|
||||
Game.Enter += (sender, e) =>
|
||||
{
|
||||
ushort lastKey = ushort.MaxValue;
|
||||
Console.WriteLine("Materials:\n" + FullGameFields._dataDb.GetValues<MaterialPropertiesData>()
|
||||
.OrderBy(kv => ushort.Parse(kv.Key))
|
||||
.Select(kv =>
|
||||
{
|
||||
ushort currentKey = ushort.Parse(kv.Key);
|
||||
string result = $"{((MaterialPropertiesData)kv.Value).Name}{(currentKey != lastKey + 1 ? $" = {kv.Key}" : "")},";
|
||||
lastKey = currentKey;
|
||||
return result;
|
||||
})
|
||||
.Aggregate((a, b) => a + "\n" + b));
|
||||
};*/
|
||||
|
||||
CommandBuilder.Builder("takeScreenshot", "Enables the screenshot taker")
|
||||
.Action(() =>
|
||||
{
|
||||
Game.CurrentGame().EnableScreenshotTaker();
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder("testPositionDefault", "Tests the Block.Position property's default value.")
|
||||
.Action(() =>
|
||||
{
|
||||
IEnumerator<TaskContract> Loop()
|
||||
{
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
Console.WriteLine("A");
|
||||
var block = Block.PlaceNew(BlockIDs.Cube, 1);
|
||||
Console.WriteLine("B");
|
||||
while (!block.Exists)
|
||||
yield return Yield.It;
|
||||
Console.WriteLine("C");
|
||||
block.Remove();
|
||||
Console.WriteLine("D");
|
||||
while (block.Exists)
|
||||
yield return Yield.It;
|
||||
Console.WriteLine("E - Pos: " + block.Position);
|
||||
block.Position = 4;
|
||||
Console.WriteLine("F - Pos: " + block.Position);
|
||||
}
|
||||
}
|
||||
|
||||
Loop().RunOn(Scheduler.leanRunner);
|
||||
}).Build();
|
||||
|
||||
CommandBuilder.Builder("importAssetBundle")
|
||||
.Action(() =>
|
||||
{
|
||||
Logging.CommandLog("Importing asset bundle...");
|
||||
var ab = AssetBundle.LoadFromFile(
|
||||
@"filepath");
|
||||
Logging.CommandLog("Imported asset bundle: " + ab);
|
||||
var assets = ab.LoadAllAssets();
|
||||
Logging.CommandLog("Loaded " + assets.Length + " assets");
|
||||
foreach (var asset in assets)
|
||||
{
|
||||
Logging.CommandLog(asset);
|
||||
}
|
||||
}).Build();
|
||||
|
||||
bool shouldTestGhostBlock = false;
|
||||
CommandBuilder.Builder("testGhostBlock")
|
||||
.Action(() =>
|
||||
{
|
||||
if (shouldTestGhostBlock)
|
||||
{
|
||||
shouldTestGhostBlock = false;
|
||||
Logging.CommandLog("Test disabled");
|
||||
}
|
||||
|
||||
shouldTestGhostBlock = true;
|
||||
Scheduler.Schedule(new Repeatable(() =>
|
||||
{
|
||||
var ghostBlock = Player.LocalPlayer.GetGhostBlock();
|
||||
if (ghostBlock == null) return;
|
||||
ghostBlock.Position = Player.LocalPlayer.Position + 2;
|
||||
ghostBlock.Color = new BlockColor(BlockColors.Lime);
|
||||
}, () => shouldTestGhostBlock));
|
||||
Logging.CommandLog("Test enabled");
|
||||
}).Build();
|
||||
|
||||
Client.EnterMenu += (sender, args) => Scheduler.Schedule(new Once(() => Client.Instance.CloseBetaPopup()));
|
||||
|
||||
Game.Enter += (sender, args) =>
|
||||
Console.WriteLine(
|
||||
$"Current game selection data: {FullGameFields._gameSelectionData.gameMode} - {FullGameFields._gameSelectionData.saveType}");
|
||||
#if TEST
|
||||
TestRoot.RunTests();
|
||||
#endif
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
Main.Shutdown();
|
||||
}
|
||||
|
||||
private string modsString;
|
||||
private string InstalledMods()
|
||||
{
|
||||
if (modsString != null) return modsString;
|
||||
StringBuilder sb = new StringBuilder("Installed mods:");
|
||||
foreach (var (_, plugin) in Chainloader.PluginInfos)
|
||||
sb.Append("\n" + plugin.Metadata.Name + " - " + plugin.Metadata.Version);
|
||||
foreach (var plugin in PluginManager.Plugins)
|
||||
sb.Append("\n" + plugin.Name + " - " + plugin.Version);
|
||||
return modsString = sb.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
[HarmonyPatch]
|
||||
public class MinimumSpecsPatch
|
||||
|
|
@ -80,5 +403,6 @@ namespace TechbloxModdingAPI.Tests
|
|||
return ((Func<bool>) MinimumSpecsCheck.CheckRequirementsMet).Method;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
using System;
|
||||
using BepInEx.Bootstrap;
|
||||
|
||||
using IllusionInjector;
|
||||
using IllusionPlugin;
|
||||
|
||||
namespace TechbloxModdingAPI.Utility
|
||||
{
|
||||
|
|
@ -13,11 +15,11 @@ namespace TechbloxModdingAPI.Utility
|
|||
/// </summary>
|
||||
/// <returns>The plugin.</returns>
|
||||
/// <param name="name">The plugin's name.</param>
|
||||
public static BepInEx.PluginInfo GetPlugin(string name)
|
||||
public static IPlugin GetPlugin(string name)
|
||||
{
|
||||
foreach(var plugin in Chainloader.PluginInfos.Values)
|
||||
foreach(IPlugin plugin in PluginManager.Plugins)
|
||||
{
|
||||
if (plugin.Metadata.Name == name)
|
||||
if (plugin.Name == name)
|
||||
{
|
||||
return plugin;
|
||||
}
|
||||
|
|
@ -33,15 +35,45 @@ namespace TechbloxModdingAPI.Utility
|
|||
/// <param name="name">The plugin's name.</param>
|
||||
public static Version GetPluginVersion(string name)
|
||||
{
|
||||
var plugin = GetPlugin(name);
|
||||
IPlugin plugin = GetPlugin(name);
|
||||
if (plugin != null) {
|
||||
try
|
||||
{
|
||||
return plugin.Metadata.Version;
|
||||
} catch (Exception e) when (e is ArgumentException or FormatException or OverflowException) {}
|
||||
return new Version(plugin.Version);
|
||||
} catch (Exception e) when (
|
||||
e is ArgumentException
|
||||
|| e is ArgumentNullException
|
||||
|| e is ArgumentOutOfRangeException
|
||||
|| e is FormatException
|
||||
|| e is OverflowException) {}
|
||||
return plugin.GetType().Assembly.GetName().Version;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// (I'm leaving the auto-generated version)
|
||||
// <summary>
|
||||
// Hell the specified name and version.
|
||||
// </summary>
|
||||
// <returns>The hell.</returns>
|
||||
// <param name="name">Name.</param>
|
||||
// <param name="version">Version.</param>
|
||||
/// <summary>
|
||||
/// Detect if you're in dependency hell with respect to the plugin.
|
||||
/// ie Check if the plugin doesn't exist or is out of date.
|
||||
/// When version is null, this only checks if the plugin exists.
|
||||
/// The version is retrieved using GetPluginVersion(string name).
|
||||
/// </summary>
|
||||
/// <returns>Are you in dependency hell?</returns>
|
||||
/// <param name="name">The plugin's name'</param>
|
||||
/// <param name="version">The target version.</param>
|
||||
public static bool Hell(string name, Version version = null)
|
||||
{
|
||||
Version pluginVersion = GetPluginVersion(name);
|
||||
if (version == null) {
|
||||
return pluginVersion == null;
|
||||
}
|
||||
return (pluginVersion == null || pluginVersion < version);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
using System;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using HarmonyLib;
|
||||
using Svelto.DataStructures;
|
||||
using Svelto.ECS;
|
||||
|
||||
namespace TechbloxModdingAPI.Utility.ECS
|
||||
{
|
||||
public static partial class NativeApiExtensions
|
||||
{
|
||||
[SuppressMessage("ReSharper", "StaticMemberInGenericType")]
|
||||
private static class EntitiesDBHelper<T> where T : unmanaged, IEntityComponent
|
||||
{ // Each type gets a new set of fields here (that's what the ReSharper warning is about too)
|
||||
public static readonly Lazy<MethodInfo> EntityStream =
|
||||
new(() => AccessTools.PropertyGetter(typeof(EntitiesDB), "_entityStream"));
|
||||
|
||||
public static readonly Lazy<FieldInfo> Streams = new(() =>
|
||||
AccessTools.Field(EntityStream.Value.ReturnType, "_streams"));
|
||||
|
||||
public static readonly Lazy<FieldInfo> Consumers = new(() =>
|
||||
AccessTools.Field(typeof(EntityStream<T>), "_consumers"));
|
||||
|
||||
public static readonly Lazy<MethodInfo> TryGetValue =
|
||||
new(AccessTools.Method(Streams.Value.FieldType, "TryGetValue"));
|
||||
|
||||
public static readonly Lazy<FieldInfo> RingBuffer =
|
||||
new(() => AccessTools.Field(typeof(Consumer<T>), "_ringBuffer"));
|
||||
}
|
||||
|
||||
private static EntityStream<T> GetEntityStream<T>(this EntitiesDB entitiesDB) where T : unmanaged, IEntityComponent
|
||||
{
|
||||
// EntitiesStreams (internal)
|
||||
var entitiesStreams = EntitiesDBHelper<T>.EntityStream.Value.Invoke(entitiesDB, Array.Empty<object>());
|
||||
// FasterDictionary<RefWrapperType, ITypeSafeStream> (interface is internal)
|
||||
var streams = EntitiesDBHelper<T>.Streams.Value.GetValue(entitiesStreams);
|
||||
|
||||
var parameters = new object[] { TypeRefWrapper<T>.wrapper, null };
|
||||
var success = EntitiesDBHelper<T>.TryGetValue.Value.Invoke(streams, parameters);
|
||||
if (!(bool)success)
|
||||
return null; // There is no entity stream for this type
|
||||
return (EntityStream<T>)parameters[1];
|
||||
}
|
||||
|
||||
private static ThreadSafeFasterList<Consumer<T>> GetConsumers<T>(this EntityStream<T> stream) where T : unmanaged, IEntityComponent
|
||||
{
|
||||
return (ThreadSafeFasterList<Consumer<T>>)EntitiesDBHelper<T>.Consumers.Value.GetValue(stream);
|
||||
}
|
||||
|
||||
private static RingBuffer<(T, EGID)> GetRingBuffer<T>(this Consumer<T> consumer) where T : unmanaged, IEntityComponent
|
||||
{
|
||||
return (RingBuffer<(T, EGID)>)EntitiesDBHelper<T>.RingBuffer.Value.GetValue(consumer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
using Svelto.ECS;
|
||||
using Svelto.ECS.Hybrid;
|
||||
|
||||
namespace TechbloxModdingAPI.Utility.ECS
|
||||
namespace TechbloxModdingAPI.Utility
|
||||
{
|
||||
public static class ManagedApiExtensions
|
||||
{
|
||||
|
|
@ -29,8 +29,7 @@ namespace TechbloxModdingAPI.Utility.ECS
|
|||
/// <param name="group">The group of the entity if the object can have multiple</param>
|
||||
/// <typeparam name="T">The component to query</typeparam>
|
||||
/// <returns>A reference to the component or a dummy value</returns>
|
||||
public static OptionalRef<T> QueryEntityOptional<T>(this EntitiesDB entitiesDB, EcsObjectBase obj,
|
||||
ExclusiveGroupStruct group = default)
|
||||
public static OptionalRef<T> QueryEntityOptional<T>(this EntitiesDB entitiesDB, EcsObjectBase obj, ExclusiveGroupStruct group = default)
|
||||
where T : struct, IEntityViewComponent
|
||||
{
|
||||
EGID id = group == ExclusiveGroupStruct.Invalid ? obj.Id : new EGID(obj.Id.entityID, group);
|
||||
|
|
@ -46,8 +45,7 @@ namespace TechbloxModdingAPI.Utility.ECS
|
|||
/// <param name="group">The group of the entity if the object can have multiple</param>
|
||||
/// <typeparam name="T">The component to query</typeparam>
|
||||
/// <returns>A reference to the component or a dummy value</returns>
|
||||
public static ref T QueryEntityOrDefault<T>(this EntitiesDB entitiesDB, EcsObjectBase obj,
|
||||
ExclusiveGroupStruct group = default)
|
||||
public static ref T QueryEntityOrDefault<T>(this EntitiesDB entitiesDB, EcsObjectBase obj, ExclusiveGroupStruct group = default)
|
||||
where T : struct, IEntityViewComponent
|
||||
{
|
||||
EGID id = group == ExclusiveGroupStruct.Invalid ? obj.Id : new EGID(obj.Id.entityID, group);
|
||||
|
|
@ -56,20 +54,5 @@ namespace TechbloxModdingAPI.Utility.ECS
|
|||
if (obj.InitData.Valid) return ref obj.InitData.Initializer(id).GetOrAdd<T>();
|
||||
return ref opt.Get(); //Default value
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Query entities as OptionalRefs. The elements always exist, it's just a nice way to encapsulate the data.
|
||||
/// </summary>
|
||||
/// <param name="entitiesDB"></param>
|
||||
/// <param name="group"></param>
|
||||
/// <param name="select"></param>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
/// <typeparam name="TR"></typeparam>
|
||||
/// <returns></returns>
|
||||
public static RefCollection<T> QueryEntitiesOptional<T>(this EntitiesDB entitiesDB, ExclusiveGroupStruct group) where T : struct, IEntityViewComponent
|
||||
{
|
||||
var (buffer, ids, count) = entitiesDB.QueryEntities<T>(group);
|
||||
return new RefCollection<T>(count, buffer, ids, group);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Svelto.DataStructures;
|
||||
using Svelto.ECS;
|
||||
using Svelto.Tasks;
|
||||
using Svelto.Tasks.Lean;
|
||||
using TechbloxModdingAPI.Tasks;
|
||||
|
||||
namespace TechbloxModdingAPI.Utility.ECS
|
||||
namespace TechbloxModdingAPI.Utility
|
||||
{
|
||||
public static partial class NativeApiExtensions
|
||||
public static class NativeApiExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Attempts to query an entity and returns an optional that contains the result if succeeded.
|
||||
|
|
@ -34,8 +33,7 @@ namespace TechbloxModdingAPI.Utility.ECS
|
|||
/// <param name="group">The group of the entity if the object can have multiple</param>
|
||||
/// <typeparam name="T">The component to query</typeparam>
|
||||
/// <returns>A reference to the component or a dummy value</returns>
|
||||
public static OptionalRef<T> QueryEntityOptional<T>(this EntitiesDB entitiesDB, EcsObjectBase obj,
|
||||
ExclusiveGroupStruct group = default)
|
||||
public static OptionalRef<T> QueryEntityOptional<T>(this EntitiesDB entitiesDB, EcsObjectBase obj, ExclusiveGroupStruct group = default)
|
||||
where T : unmanaged, IEntityComponent
|
||||
{
|
||||
EGID id = group == ExclusiveGroupStruct.Invalid ? obj.Id : new EGID(obj.Id.entityID, group);
|
||||
|
|
@ -51,8 +49,7 @@ namespace TechbloxModdingAPI.Utility.ECS
|
|||
/// <param name="group">The group of the entity if the object can have multiple</param>
|
||||
/// <typeparam name="T">The component to query</typeparam>
|
||||
/// <returns>A reference to the component or a dummy value</returns>
|
||||
public static ref T QueryEntityOrDefault<T>(this EntitiesDB entitiesDB, EcsObjectBase obj,
|
||||
ExclusiveGroupStruct group = default)
|
||||
public static ref T QueryEntityOrDefault<T>(this EntitiesDB entitiesDB, EcsObjectBase obj, ExclusiveGroupStruct group = default)
|
||||
where T : unmanaged, IEntityComponent
|
||||
{
|
||||
EGID id = group == ExclusiveGroupStruct.Invalid ? obj.Id : new EGID(obj.Id.entityID, group);
|
||||
|
|
@ -67,63 +64,39 @@ namespace TechbloxModdingAPI.Utility.ECS
|
|||
return ref opt.Get(); //Default value
|
||||
}
|
||||
|
||||
private static readonly Dictionary<Type, (int PublishedCount, HashSet<EGID> Changes)> ChangesToPublish = new();
|
||||
|
||||
/// <summary>
|
||||
/// Publishes an entity change, ignoring duplicate publishes and delaying changes as necessary.
|
||||
/// It will only publish in the next frame.
|
||||
/// </summary>
|
||||
/// <param name="entitiesDB">The entities DB to publish to</param>
|
||||
/// <param name="id">The ECS object that got changed</param>
|
||||
/// <param name="limit">Limits how many changes to publish - should be no more than the consumers' capacity that process this component</param>
|
||||
/// <typeparam name="T">The component that changed</typeparam>
|
||||
public static void PublishEntityChangeDelayed<T>(this EntitiesDB entitiesDB, EGID id)
|
||||
public static void PublishEntityChangeDelayed<T>(this EntitiesDB entitiesDB, EGID id, int limit = 80)
|
||||
where T : unmanaged, IEntityComponent
|
||||
{
|
||||
PublishChanges<T>(entitiesDB, id).RunOn(Scheduler.leanRunner);
|
||||
{ //TODO: Doesn't seem to help
|
||||
if(!ChangesToPublish.ContainsKey(typeof(T)))
|
||||
ChangesToPublish.Add(typeof(T), (0, new HashSet<EGID>()));
|
||||
var changes = ChangesToPublish[typeof(T)].Changes;
|
||||
if (changes.Contains(id)) return;
|
||||
changes.Add(id);
|
||||
PublishChanges<T>(entitiesDB, id, limit).RunOn(Scheduler.leanRunner);
|
||||
}
|
||||
|
||||
private static IEnumerator<TaskContract> PublishChanges<T>(EntitiesDB entitiesDB, EGID id)
|
||||
private static IEnumerator<TaskContract> PublishChanges<T>(EntitiesDB entitiesDB, EGID id, int limit)
|
||||
where T : unmanaged, IEntityComponent
|
||||
{
|
||||
yield return Yield.It;
|
||||
var entityStream = entitiesDB.GetEntityStream<T>();
|
||||
if (entityStream is null)
|
||||
yield break; // There is no entity stream for this type
|
||||
var consumers = entityStream.GetConsumers();
|
||||
if (consumers == null)
|
||||
{
|
||||
Console.WriteLine("Consumers is null");
|
||||
yield break;
|
||||
}
|
||||
|
||||
bool waitForConsumers;
|
||||
do
|
||||
{
|
||||
waitForConsumers = false;
|
||||
for (int i = 0; i < consumers.count; i++)
|
||||
{
|
||||
var buffer = consumers[i].GetRingBuffer();
|
||||
if (buffer.Count + 1 <= buffer.Capacity) continue;
|
||||
waitForConsumers = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if (waitForConsumers) yield return Yield.It;
|
||||
} while (waitForConsumers);
|
||||
while (ChangesToPublish[typeof(T)].PublishedCount >= limit)
|
||||
yield return Yield.It;
|
||||
entitiesDB.PublishEntityChange<T>(id);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Query entities as OptionalRefs. The elements always exist, it's just a nice way to encapsulate the data.
|
||||
/// </summary>
|
||||
/// <param name="entitiesDB"></param>
|
||||
/// <param name="group"></param>
|
||||
/// <param name="select"></param>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
/// <typeparam name="TR"></typeparam>
|
||||
/// <returns></returns>
|
||||
public static RefCollection<T> QueryEntitiesOptional<T>(this EntitiesDB entitiesDB, ExclusiveGroupStruct group) where T : unmanaged, IEntityComponent
|
||||
{
|
||||
var (buffer, ids, count) = entitiesDB.QueryEntities<T>(group);
|
||||
return new RefCollection<T>(count, buffer, ids, group);
|
||||
var (count, changes) = ChangesToPublish[typeof(T)];
|
||||
changes.Remove(id);
|
||||
ChangesToPublish[typeof(T)] = (count + 1, changes);
|
||||
yield return Yield.It;
|
||||
ChangesToPublish[typeof(T)] = (0, changes);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4,9 +4,8 @@ using Svelto.ECS;
|
|||
|
||||
namespace TechbloxModdingAPI.Utility
|
||||
{
|
||||
public ref struct OptionalRef<T> where T : struct, IBaseEntityComponent
|
||||
public ref struct OptionalRef<T> where T : struct, IEntityComponent
|
||||
{
|
||||
private readonly EGID entityId;
|
||||
private readonly State state;
|
||||
private readonly uint index;
|
||||
private NB<T> array;
|
||||
|
|
@ -14,22 +13,19 @@ namespace TechbloxModdingAPI.Utility
|
|||
private readonly EntityInitializer initializer;
|
||||
//The possible fields are: (index && (array || managedArray)) || initializer
|
||||
|
||||
public OptionalRef(NB<T> array, uint index, EGID entityId = default)
|
||||
public OptionalRef(NB<T> array, uint index)
|
||||
{
|
||||
state = State.Native;
|
||||
this.array = array;
|
||||
this.index = index;
|
||||
this.entityId = entityId;
|
||||
initializer = default;
|
||||
managedArray = default;
|
||||
}
|
||||
|
||||
public OptionalRef(MB<T> array, uint index, EGID entityId = default)
|
||||
public OptionalRef(MB<T> array, uint index)
|
||||
{
|
||||
state = State.Managed;
|
||||
managedArray = array;
|
||||
this.index = index;
|
||||
this.entityId = entityId;
|
||||
initializer = default;
|
||||
this.array = default;
|
||||
}
|
||||
|
|
@ -39,9 +35,8 @@ namespace TechbloxModdingAPI.Utility
|
|||
/// </summary>
|
||||
/// <param name="obj">The object with the initializer</param>
|
||||
/// <param name="unmanaged">Whether the struct is unmanaged</param>
|
||||
public OptionalRef(EcsObjectBase obj, bool unmanaged, EGID entityId = default)
|
||||
public OptionalRef(EcsObjectBase obj, bool unmanaged)
|
||||
{
|
||||
this.entityId = entityId;
|
||||
if (obj.InitData.Valid)
|
||||
{
|
||||
initializer = obj.InitData.Initializer(obj.Id);
|
||||
|
|
@ -54,7 +49,6 @@ namespace TechbloxModdingAPI.Utility
|
|||
}
|
||||
array = default;
|
||||
index = default;
|
||||
managedArray = default;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -79,11 +73,6 @@ namespace TechbloxModdingAPI.Utility
|
|||
set => Get() = value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The ID of the entity this component belongs to or default if it doesn't exist.
|
||||
/// </summary>
|
||||
public EGID EGID => entityId;
|
||||
|
||||
public bool Exists => state != State.Empty;
|
||||
public T? Nullable() => this ? Get() : default;
|
||||
|
||||
|
|
@ -91,8 +80,6 @@ namespace TechbloxModdingAPI.Utility
|
|||
|
||||
public static implicit operator bool(OptionalRef<T> opt) => opt.state != State.Empty;
|
||||
|
||||
public static implicit operator EGID(OptionalRef<T> opt) => opt.entityId;
|
||||
|
||||
/// <summary>
|
||||
/// Creates an instance of a struct T that can be referenced.
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -1,94 +0,0 @@
|
|||
using System;
|
||||
using Svelto.DataStructures;
|
||||
using Svelto.ECS;
|
||||
using Svelto.ECS.Hybrid;
|
||||
using Svelto.ECS.Internal;
|
||||
|
||||
namespace TechbloxModdingAPI.Utility
|
||||
{
|
||||
public readonly ref struct RefCollection<T> where T : struct, IBaseEntityComponent
|
||||
{
|
||||
private readonly bool managed;
|
||||
private readonly int count;
|
||||
private readonly NB<T> nativeArray;
|
||||
private readonly MB<T> managedArray;
|
||||
private readonly NativeEntityIDs nativeIDs;
|
||||
private readonly ManagedEntityIDs managedIDs;
|
||||
private readonly ExclusiveGroupStruct group;
|
||||
|
||||
public RefCollection(int count, MB<T> managedArray, ManagedEntityIDs managedIDs, ExclusiveGroupStruct group)
|
||||
{
|
||||
this.count = count;
|
||||
this.managedArray = managedArray;
|
||||
this.managedIDs = managedIDs;
|
||||
this.group = group;
|
||||
managed = true;
|
||||
nativeArray = default;
|
||||
nativeIDs = default;
|
||||
}
|
||||
|
||||
public RefCollection(int count, NB<T> nativeArray, NativeEntityIDs nativeIDs, ExclusiveGroupStruct group)
|
||||
{
|
||||
this.count = count;
|
||||
this.nativeArray = nativeArray;
|
||||
this.nativeIDs = nativeIDs;
|
||||
this.group = group;
|
||||
managed = false;
|
||||
managedArray = default;
|
||||
managedIDs = default;
|
||||
}
|
||||
|
||||
public Enumerator GetEnumerator() => new(this);
|
||||
|
||||
/// <summary>
|
||||
/// The amount of items in the collection.
|
||||
/// </summary>
|
||||
public int Count => count;
|
||||
|
||||
public T[] ToArray() => ToArray(a => a.Component);
|
||||
|
||||
public TA[] ToArray<TA>(Func<(T Component, EGID ID), TA> transformFunction, Predicate<(T Component, EGID ID)> predicateFunction = null)
|
||||
{
|
||||
var result = new TA[Count];
|
||||
int i = 0;
|
||||
foreach (var opt in this)
|
||||
{
|
||||
if (predicateFunction != null && !predicateFunction((opt.Get(), opt.EGID))) continue;
|
||||
result[i] = transformFunction((opt.Get(), opt.EGID));
|
||||
i++;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public ref struct Enumerator
|
||||
{
|
||||
private RefCollection<T> coll;
|
||||
private int index;
|
||||
|
||||
public Enumerator(RefCollection<T> collection)
|
||||
{
|
||||
index = -1;
|
||||
coll = collection;
|
||||
}
|
||||
|
||||
public OptionalRef<T> Current
|
||||
{
|
||||
get
|
||||
{
|
||||
if (coll.count <= index && index >= 0) return default;
|
||||
if (coll.managed)
|
||||
return new OptionalRef<T>(coll.managedArray, (uint)index,
|
||||
new EGID(coll.managedIDs[index], coll.group));
|
||||
return new OptionalRef<T>(coll.nativeArray, (uint)index,
|
||||
new EGID(coll.nativeIDs[index], coll.group));
|
||||
}
|
||||
}
|
||||
|
||||
public bool MoveNext()
|
||||
{
|
||||
return ++index < coll.count;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue