Skip to content

Commit 525643e

Browse files
authored
Merge pull request #9 from coherence/feat/sdk-1.4.2
feat: Upgrade to coherence 1.4.2
2 parents 03f1de1 + 75f911b commit 525643e

263 files changed

Lines changed: 511 additions & 628 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Assets/coherence/RuntimeSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MonoBehaviour:
1515
schemaID: 71604414093d374a927039513d29fb0fe0de11e9
1616
versionInfo: {fileID: 11400000, guid: 2191b6f902c97477baa32a7919010503, type: 2}
1717
runtimeKey: 3f2154ade8334278aac056f46461c185
18-
simulatorSlug: 1.3.1
18+
simulatorSlug: 1.4.2
1919
localHost: 127.0.0.1
2020
localWorldUDPPort: 32001
2121
localWorldWebPort: 32002

Assets/coherence/baked/Archetypes.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,4 @@ public static class Archetypes
6969
};
7070
}
7171

72-
73-
}
72+
}

Assets/coherence/baked/CoherenceSync_0109999de4f6d45bb8c13493b504dee7.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -444,15 +444,15 @@ private void BakeCommandBinding__0109999de4f6d45bb8c13493b504dee7_ad9e635638034d
444444
commandsHandler.AddBakedCommand("PositionedObject.PlayReappearShaderEffect", "()", SendCommand__0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286, ReceiveLocalCommand__0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286, MessageTarget.All, _0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286_CommandTarget, false);
445445
}
446446

447-
private void SendCommand__0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286(MessageTarget target, object[] args)
447+
private void SendCommand__0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286(MessageTarget target, ChannelID channelID, object[] args)
448448
{
449449
var command = new _0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286();
450450

451451

452-
client.SendCommand(command, target, entityId);
452+
client.SendCommand(command, target, entityId, channelID);
453453
}
454454

455-
private void ReceiveLocalCommand__0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286(MessageTarget target, object[] args)
455+
private void ReceiveLocalCommand__0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286(MessageTarget target, ChannelID _, object[] args)
456456
{
457457
var command = new _0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286();
458458

@@ -475,7 +475,8 @@ public override void ReceiveCommand(IEntityCommand command)
475475
ReceiveCommand__0109999de4f6d45bb8c13493b504dee7_ad9e635638034d88b0c6dcd8a9c83286(castedCommand);
476476
break;
477477
default:
478-
logger.Warning($"CoherenceSync_0109999de4f6d45bb8c13493b504dee7 Unhandled command: {command.GetType()}.");
478+
logger.Warning(Coherence.Log.Warning.ToolkitBakedSyncReceiveCommandUnhandled,
479+
$"CoherenceSync_0109999de4f6d45bb8c13493b504dee7 Unhandled command: {command.GetType()}.");
479480
break;
480481
}
481482
}
@@ -502,7 +503,8 @@ public override List<ICoherenceComponentData> CreateEntity(bool usesLodsAtRuntim
502503
return components;
503504
}
504505

505-
logger.Warning($"Unable to find archetype {archetypeName} in dictionary. Please, bake manually (coherence > Bake)");
506+
logger.Warning(Coherence.Log.Warning.ToolkitBakedSyncCreateEntityMissingArchetype,
507+
$"Unable to find archetype {archetypeName} in dictionary. Please, bake manually (coherence > Bake)");
506508

507509
return null;
508510
}
@@ -519,5 +521,4 @@ public override void Initialize(Entity entityId, CoherenceBridge bridge, IClient
519521
this.client = client;
520522
}
521523
}
522-
523-
}
524+
}

Assets/coherence/baked/CoherenceSync_0d27e1ad6d8e5ba4abca3216a92298f7.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -444,15 +444,15 @@ private void BakeCommandBinding__0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d
444444
commandsHandler.AddBakedCommand("PositionedObject.PlayReappearShaderEffect", "()", SendCommand__0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286, ReceiveLocalCommand__0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286, MessageTarget.All, _0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286_CommandTarget, false);
445445
}
446446

447-
private void SendCommand__0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286(MessageTarget target, object[] args)
447+
private void SendCommand__0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286(MessageTarget target, ChannelID channelID, object[] args)
448448
{
449449
var command = new _0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286();
450450

451451

452-
client.SendCommand(command, target, entityId);
452+
client.SendCommand(command, target, entityId, channelID);
453453
}
454454

455-
private void ReceiveLocalCommand__0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286(MessageTarget target, object[] args)
455+
private void ReceiveLocalCommand__0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286(MessageTarget target, ChannelID _, object[] args)
456456
{
457457
var command = new _0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286();
458458

@@ -475,7 +475,8 @@ public override void ReceiveCommand(IEntityCommand command)
475475
ReceiveCommand__0d27e1ad6d8e5ba4abca3216a92298f7_ad9e635638034d88b0c6dcd8a9c83286(castedCommand);
476476
break;
477477
default:
478-
logger.Warning($"CoherenceSync_0d27e1ad6d8e5ba4abca3216a92298f7 Unhandled command: {command.GetType()}.");
478+
logger.Warning(Coherence.Log.Warning.ToolkitBakedSyncReceiveCommandUnhandled,
479+
$"CoherenceSync_0d27e1ad6d8e5ba4abca3216a92298f7 Unhandled command: {command.GetType()}.");
479480
break;
480481
}
481482
}
@@ -502,7 +503,8 @@ public override List<ICoherenceComponentData> CreateEntity(bool usesLodsAtRuntim
502503
return components;
503504
}
504505

505-
logger.Warning($"Unable to find archetype {archetypeName} in dictionary. Please, bake manually (coherence > Bake)");
506+
logger.Warning(Coherence.Log.Warning.ToolkitBakedSyncCreateEntityMissingArchetype,
507+
$"Unable to find archetype {archetypeName} in dictionary. Please, bake manually (coherence > Bake)");
506508

507509
return null;
508510
}
@@ -519,5 +521,4 @@ public override void Initialize(Entity entityId, CoherenceBridge bridge, IClient
519521
this.client = client;
520522
}
521523
}
522-
523-
}
524+
}

Assets/coherence/baked/CoherenceSync_3889a458e94666d4784df30d8dd06d7d.cs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,15 @@ private void BakeCommandBinding__3889a458e94666d4784df30d8dd06d7d_3738e04300d846
291291
commandsHandler.AddBakedCommand("Campfire.PlayInstantEffects", "()", SendCommand__3889a458e94666d4784df30d8dd06d7d_3738e04300d846dfa774ba252d8208db, ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_3738e04300d846dfa774ba252d8208db, MessageTarget.All, _3889a458e94666d4784df30d8dd06d7d_3738e04300d846dfa774ba252d8208db_CommandTarget, false);
292292
}
293293

294-
private void SendCommand__3889a458e94666d4784df30d8dd06d7d_3738e04300d846dfa774ba252d8208db(MessageTarget target, object[] args)
294+
private void SendCommand__3889a458e94666d4784df30d8dd06d7d_3738e04300d846dfa774ba252d8208db(MessageTarget target, ChannelID channelID, object[] args)
295295
{
296296
var command = new _3889a458e94666d4784df30d8dd06d7d_3738e04300d846dfa774ba252d8208db();
297297

298298

299-
client.SendCommand(command, target, entityId);
299+
client.SendCommand(command, target, entityId, channelID);
300300
}
301301

302-
private void ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_3738e04300d846dfa774ba252d8208db(MessageTarget target, object[] args)
302+
private void ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_3738e04300d846dfa774ba252d8208db(MessageTarget target, ChannelID _, object[] args)
303303
{
304304
var command = new _3889a458e94666d4784df30d8dd06d7d_3738e04300d846dfa774ba252d8208db();
305305

@@ -320,17 +320,17 @@ private void BakeCommandBinding__3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb49
320320
commandsHandler.AddBakedCommand("Campfire.BurnObject", "(System.String)", SendCommand__3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb493facb6d766417377d4, ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb493facb6d766417377d4, MessageTarget.AuthorityOnly, _3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb493facb6d766417377d4_CommandTarget, false);
321321
}
322322

323-
private void SendCommand__3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb493facb6d766417377d4(MessageTarget target, object[] args)
323+
private void SendCommand__3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb493facb6d766417377d4(MessageTarget target, ChannelID channelID, object[] args)
324324
{
325325
var command = new _3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb493facb6d766417377d4();
326326

327327
int i = 0;
328328
command.syncConfigID = (System.String)args[i++];
329329

330-
client.SendCommand(command, target, entityId);
330+
client.SendCommand(command, target, entityId, channelID);
331331
}
332332

333-
private void ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb493facb6d766417377d4(MessageTarget target, object[] args)
333+
private void ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb493facb6d766417377d4(MessageTarget target, ChannelID _, object[] args)
334334
{
335335
var command = new _3889a458e94666d4784df30d8dd06d7d_f8f688eb08cb493facb6d766417377d4();
336336

@@ -353,18 +353,18 @@ private void BakeCommandBinding__3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4d
353353
commandsHandler.AddBakedCommand("Campfire.FireDiedDown", "(System.Int32System.Int32)", SendCommand__3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4dd28175902369f5bb38, ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4dd28175902369f5bb38, MessageTarget.All, _3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4dd28175902369f5bb38_CommandTarget, false);
354354
}
355355

356-
private void SendCommand__3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4dd28175902369f5bb38(MessageTarget target, object[] args)
356+
private void SendCommand__3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4dd28175902369f5bb38(MessageTarget target, ChannelID channelID, object[] args)
357357
{
358358
var command = new _3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4dd28175902369f5bb38();
359359

360360
int i = 0;
361361
command.oldEffectID = (System.Int32)args[i++];
362362
command.newEffectID = (System.Int32)args[i++];
363363

364-
client.SendCommand(command, target, entityId);
364+
client.SendCommand(command, target, entityId, channelID);
365365
}
366366

367-
private void ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4dd28175902369f5bb38(MessageTarget target, object[] args)
367+
private void ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4dd28175902369f5bb38(MessageTarget target, ChannelID _, object[] args)
368368
{
369369
var command = new _3889a458e94666d4784df30d8dd06d7d_3664e59fd3cd4dd28175902369f5bb38();
370370

@@ -388,7 +388,7 @@ private void BakeCommandBinding__3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b
388388
commandsHandler.AddBakedCommand("Campfire.FireStateChanged", "(System.Int32System.Int32System.String)", SendCommand__3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391, ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391, MessageTarget.All, _3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391_CommandTarget, false);
389389
}
390390

391-
private void SendCommand__3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391(MessageTarget target, object[] args)
391+
private void SendCommand__3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391(MessageTarget target, ChannelID channelID, object[] args)
392392
{
393393
var command = new _3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391();
394394

@@ -397,10 +397,10 @@ private void SendCommand__3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e
397397
command.newEffectID = (System.Int32)args[i++];
398398
command.syncConfigID = (System.String)args[i++];
399399

400-
client.SendCommand(command, target, entityId);
400+
client.SendCommand(command, target, entityId, channelID);
401401
}
402402

403-
private void ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391(MessageTarget target, object[] args)
403+
private void ReceiveLocalCommand__3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391(MessageTarget target, ChannelID _, object[] args)
404404
{
405405
var command = new _3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391();
406406

@@ -436,7 +436,8 @@ public override void ReceiveCommand(IEntityCommand command)
436436
ReceiveCommand__3889a458e94666d4784df30d8dd06d7d_df8fe4d8a6104b7ab780e439afba5391(castedCommand);
437437
break;
438438
default:
439-
logger.Warning($"CoherenceSync_3889a458e94666d4784df30d8dd06d7d Unhandled command: {command.GetType()}.");
439+
logger.Warning(Coherence.Log.Warning.ToolkitBakedSyncReceiveCommandUnhandled,
440+
$"CoherenceSync_3889a458e94666d4784df30d8dd06d7d Unhandled command: {command.GetType()}.");
440441
break;
441442
}
442443
}
@@ -463,7 +464,8 @@ public override List<ICoherenceComponentData> CreateEntity(bool usesLodsAtRuntim
463464
return components;
464465
}
465466

466-
logger.Warning($"Unable to find archetype {archetypeName} in dictionary. Please, bake manually (coherence > Bake)");
467+
logger.Warning(Coherence.Log.Warning.ToolkitBakedSyncCreateEntityMissingArchetype,
468+
$"Unable to find archetype {archetypeName} in dictionary. Please, bake manually (coherence > Bake)");
467469

468470
return null;
469471
}
@@ -480,5 +482,4 @@ public override void Initialize(Entity entityId, CoherenceBridge bridge, IClient
480482
this.client = client;
481483
}
482484
}
483-
484-
}
485+
}

Assets/coherence/baked/CoherenceSync_3d92447627afdfc419ceeb6b26251a87.cs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,15 @@ private void BakeCommandBinding__3d92447627afdfc419ceeb6b26251a87_e5df7db2535f41
183183
commandsHandler.AddBakedCommand("ChoppableTree.Chop", "()", SendCommand__3d92447627afdfc419ceeb6b26251a87_e5df7db2535f410690edf553148f2ac6, ReceiveLocalCommand__3d92447627afdfc419ceeb6b26251a87_e5df7db2535f410690edf553148f2ac6, MessageTarget.AuthorityOnly, _3d92447627afdfc419ceeb6b26251a87_e5df7db2535f410690edf553148f2ac6_CommandTarget, false);
184184
}
185185

186-
private void SendCommand__3d92447627afdfc419ceeb6b26251a87_e5df7db2535f410690edf553148f2ac6(MessageTarget target, object[] args)
186+
private void SendCommand__3d92447627afdfc419ceeb6b26251a87_e5df7db2535f410690edf553148f2ac6(MessageTarget target, ChannelID channelID, object[] args)
187187
{
188188
var command = new _3d92447627afdfc419ceeb6b26251a87_e5df7db2535f410690edf553148f2ac6();
189189

190190

191-
client.SendCommand(command, target, entityId);
191+
client.SendCommand(command, target, entityId, channelID);
192192
}
193193

194-
private void ReceiveLocalCommand__3d92447627afdfc419ceeb6b26251a87_e5df7db2535f410690edf553148f2ac6(MessageTarget target, object[] args)
194+
private void ReceiveLocalCommand__3d92447627afdfc419ceeb6b26251a87_e5df7db2535f410690edf553148f2ac6(MessageTarget target, ChannelID _, object[] args)
195195
{
196196
var command = new _3d92447627afdfc419ceeb6b26251a87_e5df7db2535f410690edf553148f2ac6();
197197

@@ -212,17 +212,17 @@ private void BakeCommandBinding__3d92447627afdfc419ceeb6b26251a87_64674b8d499942
212212
commandsHandler.AddBakedCommand("ChoppableTree.ChangeState", "(System.Boolean)", SendCommand__3d92447627afdfc419ceeb6b26251a87_64674b8d4999426fb995493ab95cb6d7, ReceiveLocalCommand__3d92447627afdfc419ceeb6b26251a87_64674b8d4999426fb995493ab95cb6d7, MessageTarget.Other, _3d92447627afdfc419ceeb6b26251a87_64674b8d4999426fb995493ab95cb6d7_CommandTarget, false);
213213
}
214214

215-
private void SendCommand__3d92447627afdfc419ceeb6b26251a87_64674b8d4999426fb995493ab95cb6d7(MessageTarget target, object[] args)
215+
private void SendCommand__3d92447627afdfc419ceeb6b26251a87_64674b8d4999426fb995493ab95cb6d7(MessageTarget target, ChannelID channelID, object[] args)
216216
{
217217
var command = new _3d92447627afdfc419ceeb6b26251a87_64674b8d4999426fb995493ab95cb6d7();
218218

219219
int i = 0;
220220
command.toUp = (System.Boolean)args[i++];
221221

222-
client.SendCommand(command, target, entityId);
222+
client.SendCommand(command, target, entityId, channelID);
223223
}
224224

225-
private void ReceiveLocalCommand__3d92447627afdfc419ceeb6b26251a87_64674b8d4999426fb995493ab95cb6d7(MessageTarget target, object[] args)
225+
private void ReceiveLocalCommand__3d92447627afdfc419ceeb6b26251a87_64674b8d4999426fb995493ab95cb6d7(MessageTarget target, ChannelID _, object[] args)
226226
{
227227
var command = new _3d92447627afdfc419ceeb6b26251a87_64674b8d4999426fb995493ab95cb6d7();
228228

@@ -245,15 +245,15 @@ private void BakeCommandBinding__3d92447627afdfc419ceeb6b26251a87_195171a3094b49
245245
commandsHandler.AddBakedCommand("ChoppableTree.PlayChopEffect", "()", SendCommand__3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09, ReceiveLocalCommand__3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09, MessageTarget.Other, _3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09_CommandTarget, false);
246246
}
247247

248-
private void SendCommand__3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09(MessageTarget target, object[] args)
248+
private void SendCommand__3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09(MessageTarget target, ChannelID channelID, object[] args)
249249
{
250250
var command = new _3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09();
251251

252252

253-
client.SendCommand(command, target, entityId);
253+
client.SendCommand(command, target, entityId, channelID);
254254
}
255255

256-
private void ReceiveLocalCommand__3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09(MessageTarget target, object[] args)
256+
private void ReceiveLocalCommand__3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09(MessageTarget target, ChannelID _, object[] args)
257257
{
258258
var command = new _3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09();
259259

@@ -282,7 +282,8 @@ public override void ReceiveCommand(IEntityCommand command)
282282
ReceiveCommand__3d92447627afdfc419ceeb6b26251a87_195171a3094b49ce9dc624b38e8a6b09(castedCommand);
283283
break;
284284
default:
285-
logger.Warning($"CoherenceSync_3d92447627afdfc419ceeb6b26251a87 Unhandled command: {command.GetType()}.");
285+
logger.Warning(Coherence.Log.Warning.ToolkitBakedSyncReceiveCommandUnhandled,
286+
$"CoherenceSync_3d92447627afdfc419ceeb6b26251a87 Unhandled command: {command.GetType()}.");
286287
break;
287288
}
288289
}
@@ -309,7 +310,8 @@ public override List<ICoherenceComponentData> CreateEntity(bool usesLodsAtRuntim
309310
return components;
310311
}
311312

312-
logger.Warning($"Unable to find archetype {archetypeName} in dictionary. Please, bake manually (coherence > Bake)");
313+
logger.Warning(Coherence.Log.Warning.ToolkitBakedSyncCreateEntityMissingArchetype,
314+
$"Unable to find archetype {archetypeName} in dictionary. Please, bake manually (coherence > Bake)");
313315

314316
return null;
315317
}
@@ -326,5 +328,4 @@ public override void Initialize(Entity entityId, CoherenceBridge bridge, IClient
326328
this.client = client;
327329
}
328330
}
329-
330-
}
331+
}

0 commit comments

Comments
 (0)