Skip to content

Commit 5552048

Browse files
committed
Merge branch 'master' into release
2 parents 424199d + 0c96ea6 commit 5552048

File tree

21 files changed

+444
-319
lines changed

21 files changed

+444
-319
lines changed

.github/workflows/dotnet.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v3
1818
with:
19-
dotnet-version: 6.0.x
19+
dotnet-version: 8.0.x
2020
- name: Restore dependencies
2121
working-directory: src/MiNET/MiNET.Console
2222
run: dotnet restore
@@ -38,5 +38,5 @@ jobs:
3838
file: src/MiNET/MiNET.Console/minet.zip
3939
asset_name: MiNET.zip
4040
tag: ${{ github.ref }}
41-
release_name: MiNET-CobwebSMP 1.13.0.10 (1.20.80)
41+
release_name: MiNET-CobwebSMP 1.13.0.11 (1.20.80)
4242
body: ${{ github.event.head_commit.message }}

src/MiNET/MiNET.Client/McpeClientMessageHandlerBase.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ public virtual void HandleMcpeInventoryTransaction(McpeInventoryTransaction mess
273273

274274
public virtual void HandleMcpeMobEquipment(McpeMobEquipment message)
275275
{
276+
/*Log.Warn($"Entity with {message.runtimeEntityId} is holding {message.item.Name}");*/
276277
}
277278

278279
public virtual void HandleMcpeMobArmorEquipment(McpeMobArmorEquipment message)
@@ -289,6 +290,25 @@ public virtual void HandleMcpeHurtArmor(McpeHurtArmor message)
289290

290291
public virtual void HandleMcpeSetEntityData(McpeSetEntityData message)
291292
{
293+
/*if (message.metadata[0] == null) { return; }
294+
MetadataLong metadataLong = message.metadata[0] as MetadataLong;
295+
byte[] bytes = BitConverter.GetBytes(metadataLong.Value);
296+
BitArray bits = new BitArray(bytes);
297+
Log.Warn($"Got entity metadata flags from value: {metadataLong.Value}");
298+
Log.Warn($"start =============================================");
299+
for (int i = 0; i < Enum.GetValues(typeof(DataFlags)).Length; i++)
300+
{
301+
DataFlags flag = (DataFlags) i;
302+
if (i < 64)
303+
{
304+
Log.Warn($"{flag}: {bits[i]}");
305+
}
306+
else
307+
{
308+
Log.Warn($"{flag}: {bits[i - 64]}");
309+
}
310+
}
311+
Log.Warn($"end =============================================");*/
292312
}
293313

294314
public virtual void HandleMcpeSetEntityMotion(McpeSetEntityMotion message)

src/MiNET/MiNET.Client/MiNET.Client.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<ApplicationIcon />
55
<OutputType>Exe</OutputType>
66
<StartupObject></StartupObject>

0 commit comments

Comments
 (0)