Fixed battle

Moved more of P3D specific code to the P3D project Disabled Pokemon Validation code for now
P3D-Legacy · Jun 6, 2023 · 4ce7197 · 4ce7197
1 parent 64f8403
commit 4ce7197
Show file tree

Hide file tree

Showing 78 changed files with 233 additions and 183 deletions.
diff --git a/src/P3D.Legacy.Common/Packets/Battle/BattleClientDataToClientPacket.cs b/src/P3D.Legacy.Common/Packets/Battle/BattleClientDataToClientPacket.cs
diff --git a/src/P3D.Legacy.Server.Abstractions/Events/PlayerTradeOfferedPokemonEvent.cs b/src/P3D.Legacy.Server.Abstractions/Events/PlayerTradeOfferedPokemonEvent.cs
diff --git a/src/P3D.Legacy.Server.Application/Extensions/ServiceCollectionExtensions.cs b/src/P3D.Legacy.Server.Application/Extensions/ServiceCollectionExtensions.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 
-using P3D.Legacy.Common.Packets;
 using P3D.Legacy.Server.Application.CommandHandlers.Administration;
 using P3D.Legacy.Server.Application.CommandHandlers.Player;
 using P3D.Legacy.Server.Application.CommandHandlers.Trade;
@@ -51,7 +50,6 @@ public static IServiceCollection AddApplication(this IServiceCollection services
  services.AddQueryHandler<GetWorldStateQueryHandler>();
 
 
- services.AddSingleton<IP3DPacketFactory, P3DPacketServerFactory>();
 
  services.AddScoped<ConnectionContextHandlerFactory>();
 

diff --git a/src/P3D.Legacy.Server.Application/QueryHandlers/Player/GetMonsterByDataQueryHandler.cs b/src/P3D.Legacy.Server.Application/QueryHandlers/Player/GetMonsterByDataQueryHandler.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+/*
+using Microsoft.Extensions.Logging;
 
 using P3D.Legacy.Common.Monsters;
 using P3D.Legacy.Server.Application.Queries.Player;
@@ -31,4 +32,5 @@ public async Task<IMonsterInstance> HandleAsync(GetMonsterByDataQuery query, Can
  return await _monsterRepository.GetByDataAsync(monsterData, ct);
  }
  }
-}
+}
+*/
diff --git a/src/P3D.Legacy.Server.Benchmark/Program.cs b/src/P3D.Legacy.Server.Benchmark/Program.cs
@@ -2,10 +2,10 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-using P3D.Legacy.Common.Packets;
 using P3D.Legacy.Server.Benchmark.Options;
 using P3D.Legacy.Server.Benchmark.Services;
 using P3D.Legacy.Server.Client.P3D;
+using P3D.Legacy.Server.Client.P3D.Packets;
 
 using System.CommandLine.Binding;
 using System.CommandLine.Builder;

diff --git a/src/P3D.Legacy.Server.Benchmark/Services/BenchmarkService.cs b/src/P3D.Legacy.Server.Benchmark/Services/BenchmarkService.cs
@@ -6,12 +6,12 @@
 using Microsoft.Extensions.Options;
 
 using P3D.Legacy.Common;
-using P3D.Legacy.Common.Packets;
-using P3D.Legacy.Common.Packets.Chat;
-using P3D.Legacy.Common.Packets.Common;
-using P3D.Legacy.Common.Packets.Server;
 using P3D.Legacy.Server.Benchmark.Options;
 using P3D.Legacy.Server.Client.P3D;
+using P3D.Legacy.Server.Client.P3D.Packets;
+using P3D.Legacy.Server.Client.P3D.Packets.Chat;
+using P3D.Legacy.Server.Client.P3D.Packets.Common;
+using P3D.Legacy.Server.Client.P3D.Packets.Server;
 
 using System;
 using System.Collections.Generic;

diff --git a/src/P3D.Legacy.Server.Benchmark/Services/BenchmarkStatusService.cs b/src/P3D.Legacy.Server.Benchmark/Services/BenchmarkStatusService.cs
@@ -3,10 +3,10 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-using P3D.Legacy.Common.Packets.Client;
-using P3D.Legacy.Common.Packets.Server;
 using P3D.Legacy.Server.Benchmark.Options;
 using P3D.Legacy.Server.Client.P3D;
+using P3D.Legacy.Server.Client.P3D.Packets.Client;
+using P3D.Legacy.Server.Client.P3D.Packets.Server;
 
 using System;
 using System.Diagnostics;

diff --git a/....Common/Data/P3DDatas/BattleClientData.cs → ...ent.P3D/Data/P3DDatas/BattleClientData.cs b/....Common/Data/P3DDatas/BattleClientData.cs → ...ent.P3D/Data/P3DDatas/BattleClientData.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace P3D.Legacy.Common.Data.P3DDatas
+namespace P3D.Legacy.Server.Client.P3D.Data.P3DDatas
 {
  public sealed record BattleClientData : P3DData
  {

diff --git a/...ommon/Data/P3DDatas/BattleEndRoundData.cs → ...t.P3D/Data/P3DDatas/BattleEndRoundData.cs b/...ommon/Data/P3DDatas/BattleEndRoundData.cs → ...t.P3D/Data/P3DDatas/BattleEndRoundData.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace P3D.Legacy.Common.Data.P3DDatas
+namespace P3D.Legacy.Server.Client.P3D.Data.P3DDatas
 {
  public sealed record BattleEndRoundData : P3DData
  {

diff --git a/...cy.Common/Data/P3DDatas/BattleHostData.cs → ...lient.P3D/Data/P3DDatas/BattleHostData.cs b/...cy.Common/Data/P3DDatas/BattleHostData.cs → ...lient.P3D/Data/P3DDatas/BattleHostData.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace P3D.Legacy.Common.Data.P3DDatas
+namespace P3D.Legacy.Server.Client.P3D.Data.P3DDatas
 {
  public sealed record BattleHostData : P3DData
  {

diff --git a/...y.Common/Data/P3DDatas/BattleOfferData.cs → ...ient.P3D/Data/P3DDatas/BattleOfferData.cs b/...y.Common/Data/P3DDatas/BattleOfferData.cs → ...ient.P3D/Data/P3DDatas/BattleOfferData.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace P3D.Legacy.Common.Data.P3DDatas
+namespace P3D.Legacy.Server.Client.P3D.Data.P3DDatas
 {
  // If LeadMonsterIndex is not null, this is a confirmation, else client just gives the monsters for the battle
  public sealed record BattleOfferData : P3DData

diff --git a/...3D.Legacy.Common/Data/P3DDatas/P3DData.cs → ...erver.Client.P3D/Data/P3DDatas/P3DData.cs b/...3D.Legacy.Common/Data/P3DDatas/P3DData.cs → ...erver.Client.P3D/Data/P3DDatas/P3DData.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace P3D.Legacy.Common.Data.P3DDatas
+namespace P3D.Legacy.Server.Client.P3D.Data.P3DDatas
 {
  public abstract record P3DData
  {

diff --git a/....Legacy.Common/Data/P3DDatas/TradeData.cs → ...ver.Client.P3D/Data/P3DDatas/TradeData.cs b/....Legacy.Common/Data/P3DDatas/TradeData.cs → ...ver.Client.P3D/Data/P3DDatas/TradeData.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace P3D.Legacy.Common.Data.P3DDatas
+namespace P3D.Legacy.Server.Client.P3D.Data.P3DDatas
 {
  public sealed record TradeData : P3DData
  {

diff --git a/src/P3D.Legacy.Common/DataItemStorage.cs → ...gacy.Server.Client.P3D/DataItemStorage.cs b/src/P3D.Legacy.Common/DataItemStorage.cs → ...gacy.Server.Client.P3D/DataItemStorage.cs
@@ -1,17 +1,19 @@
-using System;
+using P3D.Legacy.Common;
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Globalization;
 using System.Linq;
 
-namespace P3D.Legacy.Common
+namespace P3D.Legacy.Server.Client.P3D
 {
  public sealed record DataItemStorage : IReadOnlyCollection<string>
  {
- private static int BootlegCount(IReadOnlyDictionary<int, string> dataItems) => dataItems.Count > 0 ? dataItems.LastOrDefault().Key + 1 : 0;
+ private static int BootlegCount(Dictionary<int, string> dataItems) => dataItems.Count > 0 ? dataItems.LastOrDefault().Key + 1 : 0;
 
- private static IEnumerable<string> Iterate(IReadOnlyDictionary<int, string> dataItems)
+ private static IEnumerable<string> Iterate(Dictionary<int, string> dataItems)
  {
  var min = 0;
  var max = BootlegCount(dataItems);

diff --git a/src/P3D.Legacy.Server.Client.P3D/Events/PlayerSentRawP3DPacketEvent.cs b/src/P3D.Legacy.Server.Client.P3D/Events/PlayerSentRawP3DPacketEvent.cs
@@ -1,5 +1,5 @@
-using P3D.Legacy.Common.Packets;
-using P3D.Legacy.Server.Abstractions;
+using P3D.Legacy.Server.Abstractions;
+using P3D.Legacy.Server.Client.P3D.Packets;
 using P3D.Legacy.Server.CQERS.Events;
 
 namespace P3D.Legacy.Server.Client.P3D.Events

diff --git a/src/P3D.Legacy.Server.Client.P3D/Events/PlayerTradeOfferedP3DMonsterEvent.cs b/src/P3D.Legacy.Server.Client.P3D/Events/PlayerTradeOfferedP3DMonsterEvent.cs
@@ -0,0 +1,9 @@
+using P3D.Legacy.Common;
+using P3D.Legacy.Server.Abstractions;
+using P3D.Legacy.Server.Client.P3D.Data.P3DDatas;
+using P3D.Legacy.Server.CQERS.Events;
+
+namespace P3D.Legacy.Server.Client.P3D.Events
+{
+ public sealed record PlayerTradeOfferedP3DMonsterEvent(IPlayer Player, Origin Partner, TradeData Data) : IEvent;
+}
diff --git a/....Common/Extensions/DataItemsExtensions.cs → ...ent.P3D/Extensions/DataItemsExtensions.cs b/....Common/Extensions/DataItemsExtensions.cs → ...ent.P3D/Extensions/DataItemsExtensions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace P3D.Legacy.Common.Extensions
+namespace P3D.Legacy.Server.Client.P3D.Extensions
 {
  public static class DataItemsExtensions
  {

diff --git a/...cy.Common/Extensions/MonsterExtensions.cs → ...lient.P3D/Extensions/MonsterExtensions.cs b/...cy.Common/Extensions/MonsterExtensions.cs → ...lient.P3D/Extensions/MonsterExtensions.cs
@@ -5,7 +5,7 @@
 using System.Globalization;
 using System.Text;
 
-namespace P3D.Legacy.Common.Extensions
+namespace P3D.Legacy.Server.Client.P3D.Extensions
 {
  public static class MonsterExtensions
  {

diff --git a/src/P3D.Legacy.Server.Client.P3D/Extensions/ServiceCollectionExtensions.cs b/src/P3D.Legacy.Server.Client.P3D/Extensions/ServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@
 
 using P3D.Legacy.Server.Application.Services;
 using P3D.Legacy.Server.Client.P3D.EventHandlers;
+using P3D.Legacy.Server.Client.P3D.Packets;
 using P3D.Legacy.Server.Client.P3D.Services;
 using P3D.Legacy.Server.CQERS.Extensions;
 
@@ -19,6 +20,8 @@ public static IServiceCollection AddClientP3D(this IServiceCollection services)
  //services.AddTransient<StatisticsHandler>();
  //services.AddEvents(sp => sp.GetRequiredService<StatisticsHandler>());
 
+ services.AddSingleton<IP3DPacketFactory, P3DPacketServerFactory>();
+
  services.AddHostedService<P3DPlayerMovementCompensationService>();
 
  services.AddScoped<P3DConnectionContextHandler>();

diff --git a/...cy.Common/Extensions/Vector3Extensions.cs → ...lient.P3D/Extensions/Vector3Extensions.cs b/...cy.Common/Extensions/Vector3Extensions.cs → ...lient.P3D/Extensions/Vector3Extensions.cs
@@ -3,7 +3,7 @@
 using System.Numerics;
 using System.Text;
 
-namespace P3D.Legacy.Common.Extensions
+namespace P3D.Legacy.Server.Client.P3D.Extensions
 {
  public static class Vector3Extensions
  {

diff --git a/...tructure/Models/Monsters/MonsterEntity.cs → ...t.P3D/Models/Monsters/P3DMonsterEntity.cs b/...tructure/Models/Monsters/MonsterEntity.cs → ...t.P3D/Models/Monsters/P3DMonsterEntity.cs
@@ -1,13 +1,13 @@
-using P3D.Legacy.Common.Extensions;
-using P3D.Legacy.Common.Monsters;
+using P3D.Legacy.Common.Monsters;
+using P3D.Legacy.Server.Client.P3D.Extensions;
 
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace P3D.Legacy.Server.Infrastructure.Models.Monsters
+namespace P3D.Legacy.Server.Client.P3D.Models.Monsters
 {
- public sealed class MonsterEntity : IMonsterInstance
+ public sealed class P3DMonsterEntity : IMonsterInstance
  {
  public IMonsterStaticData StaticData { get; }
  public CatchInfo CatchInfo { get; }
@@ -27,7 +27,7 @@ public sealed class MonsterEntity : IMonsterInstance
  public IItemInstance? HeldItem { get; }
  public IDictionary<string, string> Metadata { get; } = new Dictionary<string, string>(StringComparer.Ordinal);
 
- public MonsterEntity(in ReadOnlySpan<char> monsterData, IMonsterStaticData monsterStaticData, IReadOnlyList<IAttackInstance> attacks, IItemInstance? heldItem)
+ public P3DMonsterEntity(in ReadOnlySpan<char> monsterData, IMonsterStaticData monsterStaticData, IReadOnlyList<IAttackInstance> attacks, IItemInstance? heldItem)
  {
  StaticData = monsterStaticData;
 

diff --git a/src/P3D.Legacy.Server.Client.P3D/P3DConnectionContextHandler.Functions.cs b/src/P3D.Legacy.Server.Client.P3D/P3DConnectionContextHandler.Functions.cs
@@ -3,11 +3,11 @@
 using OpenTelemetry.Trace;
 
 using P3D.Legacy.Common;
-using P3D.Legacy.Common.Packets;
-using P3D.Legacy.Common.Packets.Chat;
-using P3D.Legacy.Common.Packets.Common;
-using P3D.Legacy.Common.Packets.Server;
 using P3D.Legacy.Server.Abstractions;
+using P3D.Legacy.Server.Client.P3D.Packets;
+using P3D.Legacy.Server.Client.P3D.Packets.Chat;
+using P3D.Legacy.Server.Client.P3D.Packets.Common;
+using P3D.Legacy.Server.Client.P3D.Packets.Server;
 
 using System;
 using System.Diagnostics;

diff --git a/src/P3D.Legacy.Server.Client.P3D/P3DConnectionContextHandler.Notifications.cs b/src/P3D.Legacy.Server.Client.P3D/P3DConnectionContextHandler.Notifications.cs
@@ -1,9 +1,4 @@
 using P3D.Legacy.Common;
-using P3D.Legacy.Common.Extensions;
-using P3D.Legacy.Common.Packets.Battle;
-using P3D.Legacy.Common.Packets.Chat;
-using P3D.Legacy.Common.Packets.Server;
-using P3D.Legacy.Common.Packets.Trade;
 using P3D.Legacy.Common.PlayerEvents;
 using P3D.Legacy.Server.Abstractions;
 using P3D.Legacy.Server.Abstractions.Events;
@@ -12,6 +7,11 @@
 using P3D.Legacy.Server.Application.Queries.Options;
 using P3D.Legacy.Server.Application.Queries.Player;
 using P3D.Legacy.Server.Client.P3D.Events;
+using P3D.Legacy.Server.Client.P3D.Extensions;
+using P3D.Legacy.Server.Client.P3D.Packets.Battle;
+using P3D.Legacy.Server.Client.P3D.Packets.Chat;
+using P3D.Legacy.Server.Client.P3D.Packets.Server;
+using P3D.Legacy.Server.Client.P3D.Packets.Trade;
 using P3D.Legacy.Server.CQERS.Events;
 
 using System;
@@ -41,7 +41,7 @@ internal partial class P3DConnectionContextHandler :
  IEventHandler<PlayerTradeInitiatedEvent>,
  IEventHandler<PlayerTradeAcceptedEvent>,
  IEventHandler<PlayerTradeAbortedEvent>,
- IEventHandler<PlayerTradeOfferedPokemonEvent>,
+ IEventHandler<PlayerTradeOfferedP3DMonsterEvent>,
  IEventHandler<PlayerTradeConfirmedEvent>,
  IEventHandler<ServerStoppingEvent>
  {
@@ -274,19 +274,21 @@ public async Task HandleAsync(IReceiveContext<PlayerTradeAbortedEvent> context,
  await SendPacketAsync(new TradeQuitPacket { Origin = player.Origin, DestinationPlayerOrigin = partner }, ct);
  }
 
- public async Task HandleAsync(IReceiveContext<PlayerTradeOfferedPokemonEvent> context, CancellationToken ct)
+ public async Task HandleAsync(IReceiveContext<PlayerTradeOfferedP3DMonsterEvent> context, CancellationToken ct)
  {
  var (player, target, data) = context.Message;
 
  if (Origin != target) return;
 
  var cancel = false;
+ /*
  var serverOptions = await _queryDispatcher.DispatchAsync(new GetServerOptionsQuery(), ct);
  if (serverOptions.ValidationEnabled)
  {
  var monster = await _queryDispatcher.DispatchAsync(new GetMonsterByDataQuery(data.MonsterData), ct);
  cancel = !monster.IsValidP3D();
  }
+ */
 
  if (cancel)
  {

diff --git a/src/P3D.Legacy.Server.Client.P3D/P3DConnectionContextHandler.Packets.cs b/src/P3D.Legacy.Server.Client.P3D/P3DConnectionContextHandler.Packets.cs
@@ -2,14 +2,6 @@
 using Microsoft.Extensions.Logging;
 
 using P3D.Legacy.Common;
-using P3D.Legacy.Common.Extensions;
-using P3D.Legacy.Common.Packets;
-using P3D.Legacy.Common.Packets.Battle;
-using P3D.Legacy.Common.Packets.Chat;
-using P3D.Legacy.Common.Packets.Client;
-using P3D.Legacy.Common.Packets.Common;
-using P3D.Legacy.Common.Packets.Server;
-using P3D.Legacy.Common.Packets.Trade;
 using P3D.Legacy.Common.PlayerEvents;
 using P3D.Legacy.Server.Abstractions;
 using P3D.Legacy.Server.Abstractions.Events;
@@ -18,6 +10,14 @@
 using P3D.Legacy.Server.Application.Queries.Player;
 using P3D.Legacy.Server.Application.Queries.World;
 using P3D.Legacy.Server.Client.P3D.Events;
+using P3D.Legacy.Server.Client.P3D.Extensions;
+using P3D.Legacy.Server.Client.P3D.Packets;
+using P3D.Legacy.Server.Client.P3D.Packets.Battle;
+using P3D.Legacy.Server.Client.P3D.Packets.Chat;
+using P3D.Legacy.Server.Client.P3D.Packets.Client;
+using P3D.Legacy.Server.Client.P3D.Packets.Common;
+using P3D.Legacy.Server.Client.P3D.Packets.Server;
+using P3D.Legacy.Server.Client.P3D.Packets.Trade;
 
 using System;
 using System.Collections.Immutable;
@@ -422,7 +422,7 @@ private async Task HandleTradeOfferAsync(TradeOfferFromClientPacket packet, Canc
  if (State != PlayerState.Initialized)
  return;
 
- await _eventDispatcher.DispatchAsync(new PlayerTradeOfferedPokemonEvent(this, packet.DestinationPlayerOrigin, packet.TradeData), ct);
+ await _eventDispatcher.DispatchAsync(new PlayerTradeOfferedP3DMonsterEvent(this, packet.DestinationPlayerOrigin, packet.TradeData), ct);
  }
  private async Task HandleTradeStartAsync(TradeStartPacket packet, CancellationToken ct)
  {
@@ -459,6 +459,7 @@ private async Task HandleBattleOfferAsync(BattleOfferFromClientPacket packet, Ca
  return;
 
  var cancel = false;
+ /*
  var serverOptions = await _queryDispatcher.DispatchAsync(new GetServerOptionsQuery(), ct);
  if (serverOptions.ValidationEnabled)
  {
@@ -475,6 +476,7 @@ await foreach (var monster in query)
  }
  }
  }
+ */
 
  if (cancel)
  {