Skip to content

Commit 9780cc8

Browse files
jonaslagonijonaslagoni
committed
feat: update dependency and switch to jetstream
1 parent ec37159 commit 9780cc8

File tree

2 files changed

+40
-36
lines changed

2 files changed

+40
-36
lines changed

‎GamingAPIPlugins/GamingAPIPlugins.csproj‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>net461</TargetFrameworks>
@@ -9,11 +9,15 @@
99
<FileVersion>0.9.0.0</FileVersion>
1010
<RepositoryUrl>https://github.com/GamingAPI/umod-rust-server-plugin.git</RepositoryUrl>
1111
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<None Remove="Managed\System.Configuration.Install.dll" />
15+
</ItemGroup>
1216
<ItemGroup>
1317
<Reference Include="0Harmony">
1418
<HintPath>Managed\0Harmony.dll</HintPath>
1519
</Reference>
16-
<Reference Include="Accessibility"/>
20+
<Reference Include="Accessibility" />
1721
<Reference Include="ApexAI">
1822
<HintPath>Managed\ApexAI.dll</HintPath>
1923
</Reference>
@@ -202,38 +206,38 @@
202206
<Reference Include="Rust.World">
203207
<HintPath>Managed\Rust.World.dll</HintPath>
204208
</Reference>
205-
<Reference Include="System"/>
209+
<Reference Include="System" />
206210
<Reference Include="System.Buffers">
207211
<HintPath>Managed\System.Buffers.dll</HintPath>
208212
</Reference>
209-
<Reference Include="System.ComponentModel.Composition"/>
210-
<Reference Include="System.ComponentModel.DataAnnotations"/>
211-
<Reference Include="System.Configuration"/>
213+
<Reference Include="System.ComponentModel.Composition" />
214+
<Reference Include="System.ComponentModel.DataAnnotations" />
215+
<Reference Include="System.Configuration" />
212216
<Reference Include="System.Configuration.Install"/>
213-
<Reference Include="System.Data"/>
217+
<Reference Include="System.Data" />
214218
<Reference Include="System.Data.SQLite">
215219
<HintPath>Managed\System.Data.SQLite.dll</HintPath>
216220
</Reference>
217-
<Reference Include="System.Design"/>
221+
<Reference Include="System.Design" />
218222
<Reference Include="System.Diagnostics.StackTrace, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
219223
<SpecificVersion>False</SpecificVersion>
220224
<HintPath>Managed\System.Diagnostics.StackTrace.dll</HintPath>
221225
</Reference>
222-
<Reference Include="System.DirectoryServices"/>
223-
<Reference Include="System.Drawing"/>
224-
<Reference Include="System.Drawing.Design"/>
225-
<Reference Include="System.EnterpriseServices"/>
226+
<Reference Include="System.DirectoryServices" />
227+
<Reference Include="System.Drawing" />
228+
<Reference Include="System.Drawing.Design" />
229+
<Reference Include="System.EnterpriseServices" />
226230
<Reference Include="System.Globalization.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
227231
<SpecificVersion>False</SpecificVersion>
228232
<HintPath>Managed\System.Globalization.Extensions.dll</HintPath>
229233
</Reference>
230-
<Reference Include="System.IO.Compression"/>
231-
<Reference Include="System.IO.Compression.FileSystem"/>
234+
<Reference Include="System.IO.Compression" />
235+
<Reference Include="System.IO.Compression.FileSystem" />
232236
<Reference Include="System.Memory">
233237
<HintPath>Managed\System.Memory.dll</HintPath>
234238
</Reference>
235-
<Reference Include="System.Net.Http"/>
236-
<Reference Include="System.Numerics"/>
239+
<Reference Include="System.Net.Http" />
240+
<Reference Include="System.Numerics" />
237241
<Reference Include="System.Numerics.Vectors">
238242
<HintPath>Managed\System.Numerics.Vectors.dll</HintPath>
239243
</Reference>
@@ -243,23 +247,23 @@
243247
<Reference Include="System.Runtime.CompilerServices.Unsafe">
244248
<HintPath>Managed\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
245249
</Reference>
246-
<Reference Include="System.Runtime.Serialization"/>
247-
<Reference Include="System.Runtime.Serialization.Formatters.Soap"/>
250+
<Reference Include="System.Runtime.Serialization" />
251+
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
248252
<Reference Include="System.Runtime.Serialization.Xml">
249253
<HintPath>Managed\System.Runtime.Serialization.Xml.dll</HintPath>
250254
</Reference>
251-
<Reference Include="System.Security"/>
255+
<Reference Include="System.Security" />
252256
<Reference Include="System.ServiceModel.Internals, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
253257
<SpecificVersion>False</SpecificVersion>
254258
<HintPath>Managed\System.ServiceModel.Internals.dll</HintPath>
255259
</Reference>
256-
<Reference Include="System.Transactions"/>
257-
<Reference Include="System.Web"/>
258-
<Reference Include="System.Web.ApplicationServices"/>
259-
<Reference Include="System.Web.Services"/>
260-
<Reference Include="System.Windows.Forms"/>
261-
<Reference Include="System.Xml"/>
262-
<Reference Include="System.Xml.Linq"/>
260+
<Reference Include="System.Transactions" />
261+
<Reference Include="System.Web" />
262+
<Reference Include="System.Web.ApplicationServices" />
263+
<Reference Include="System.Web.Services" />
264+
<Reference Include="System.Windows.Forms" />
265+
<Reference Include="System.Xml" />
266+
<Reference Include="System.Xml.Linq" />
263267
<Reference Include="System.Xml.XPath.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
264268
<SpecificVersion>False</SpecificVersion>
265269
<HintPath>Managed\System.Xml.XPath.XDocument.dll</HintPath>
@@ -449,7 +453,7 @@
449453
</Reference>
450454
</ItemGroup>
451455
<ItemGroup>
452-
<PackageReference Include="Oxide.Ext.GamingApi" Version="0.13.0"/>
456+
<PackageReference Include="Oxide.Ext.GamingApi" Version="0.15.0" />
453457
</ItemGroup>
454458
<ItemGroup>
455459
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">

‎GamingAPIPlugins/plugins/GamingAPI.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private void Init()
1919
{
2020
Timestamp = System.DateTime.Now.ToString()
2121
};
22-
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdEventsStarted(message, DefaultPluginInformation.GetServerId());
22+
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdEventsStartedJetStream(message, DefaultPluginInformation.GetServerId());
2323
});
2424
}
2525

@@ -42,7 +42,7 @@ object OnPlayerChat(BasePlayer player, string message, Chat.ChatChannel channel)
4242
PlayerName = player.displayName
4343
};
4444

45-
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdEventsPlayerSteamIdChatted(chatMessage, DefaultPluginInformation.GetServerId(), player.UserIDString);
45+
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdEventsPlayerSteamIdChattedJetStream(chatMessage, DefaultPluginInformation.GetServerId(), player.UserIDString);
4646
});
4747
return null;
4848
}
@@ -54,7 +54,7 @@ private void ResourceGathered(BasePlayer player, Item item)
5454
{
5555
GamingApiMessageQueue.Instance.AddToMessageQueue(MessageImportance.NORMAL, (System.Action success, System.Action failed) =>
5656
{
57-
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsGatheredResources(ConvertToResouceRequestMessage(item, player), DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
57+
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsGatheredResourcesJetStream(ConvertToResouceRequestMessage(item, player), DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
5858
});
5959
}
6060

@@ -122,7 +122,7 @@ void OnPlayerRespawned(BasePlayer player)
122122
}
123123
};
124124

125-
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsRespawned(playerRespawn, DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
125+
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsRespawnedJetStream(playerRespawn, DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
126126
});
127127
}
128128

@@ -140,7 +140,7 @@ void OnPlayerDisconnected(BasePlayer player, string reason)
140140
//Must be the lowest importance to ensure all other events are are processed first
141141
GamingApiMessageQueue.Instance.AddToMessageQueue(MessageImportance.LOWEST, (System.Action success, System.Action failed) =>
142142
{
143-
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsDisconnected(p, DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
143+
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsDisconnectedJetStream(p, DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
144144
});
145145
}
146146

@@ -161,7 +161,7 @@ void OnPlayerInit(BasePlayer player)
161161

162162
GamingApiMessageQueue.Instance.AddToMessageQueue(MessageImportance.IMPORTANT, (System.Action success, System.Action failed) =>
163163
{
164-
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsConnected(p, DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
164+
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsConnectedJetStream(p, DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
165165
});
166166
}
167167

@@ -172,7 +172,7 @@ void OnNewSave(string filename)
172172
{
173173
GamingApiMessageQueue.Instance.AddToMessageQueue(MessageImportance.STRICT, (System.Action success, System.Action failed) =>
174174
{
175-
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdEventsWiped(DefaultPluginInformation.GetServerId());
175+
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdEventsWipedJetStream(DefaultPluginInformation.GetServerId());
176176
});
177177
}
178178

@@ -191,7 +191,7 @@ void OnWeaponPickup(BasePlayer player, Item item)
191191
};
192192
GamingApiMessageQueue.Instance.AddToMessageQueue(MessageImportance.IMPORTANT, (System.Action success, System.Action failed) =>
193193
{
194-
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsItemsItemIdPickup(i, DefaultPluginInformation.GetServerId(), player.IPlayer.Id, "" + item.info.itemid);
194+
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsItemsItemIdPickupJetStream(i, DefaultPluginInformation.GetServerId(), player.IPlayer.Id, "" + item.info.itemid);
195195
});
196196
}
197197

@@ -254,7 +254,7 @@ void OnPlayerDamage(BasePlayer player, HitInfo info)
254254
poph.SteamId = attacker.IPlayer.Id;
255255
GamingApiMessageQueue.Instance.AddToMessageQueue(MessageImportance.IMPORTANT, (System.Action success, System.Action failed) =>
256256
{
257-
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsCombatHit(pophWrapper, DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
257+
DefaultPluginInformation.GetInstance().NatsClient.PublishToV0RustServersServerIdPlayersSteamIdEventsCombatHitJetStream(pophWrapper, DefaultPluginInformation.GetServerId(), player.IPlayer.Id);
258258
});
259259
});
260260
}

0 commit comments

Comments
 (0)