Skip to content

Commit 57addb4

Browse files
committed
1.21.30
1 parent a2b0f8a commit 57addb4

File tree

18 files changed

+3287
-3845
lines changed

18 files changed

+3287
-3845
lines changed

.github/workflows/dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.16 (1.21.20)
41+
release_name: MiNET-CobwebSMP 1.13.0.17 (1.21.30)
4242
body: ${{ github.event.head_commit.message }}

src/MiNET/MiNET.Client/BedrockTraceHandler.cs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ public override void HandleMcpeResourcePacksInfo(McpeResourcePacksInfo message)
103103
sb.AppendLine($"ID={info.UUID}, Version={info.Version}, Unknown={info.Size}");
104104
}
105105

106-
sb.AppendLine("Behavior packs:");
107-
foreach (ResourcePackInfo info in message.behahaviorpackinfos)
108-
{
109-
sb.AppendLine($"ID={info.UUID}, Version={info.Version}");
110-
}
111-
112106
Log.Debug(sb.ToString());
113107

114108
base.HandleMcpeResourcePacksInfo(message);
@@ -183,9 +177,9 @@ public override void HandleMcpePlayerHotbar(McpePlayerHotbar message)
183177

184178
public override void HandleMcpeInventoryContent(McpeInventoryContent message)
185179
{
186-
CallPacketHandlers(message);
180+
Log.Error($"Set container content on Window ID: 0x{message.inventoryId:x2}, Count: {message.input.Count}, ContainerName: {message.ContainerName.ContainerId} - {message.ContainerName.DynamicId}, dynamicSlotSize: {message.dynamicSlotSize}");
187181

188-
Log.Debug($"Set container content on Window ID: 0x{message.inventoryId:x2}, Count: {message.input.Count}");
182+
CallPacketHandlers(message);
189183

190184
if (Client.IsEmulator) return;
191185

@@ -214,11 +208,11 @@ public override void HandleMcpeCreativeContent(McpeCreativeContent message)
214208
//Log.Warn($"Got item: {item.Name} ({item.Id} : {item.Metadata})");
215209
if (item.ExtraData == null)
216210
{
217-
writer.WriteLine($"new Item({item.Id}, {item.Metadata}),");
211+
writer.WriteLine($"new Item({item.Id}, {item.Metadata}){{ RuntimeId = {item.RuntimeId},");
218212
}
219213
else
220214
{
221-
writer.WriteLine($"new Item({item.Id}, {item.Metadata}){{ ExtraData = {item.ExtraData}}},");
215+
writer.WriteLine($"new Item({item.Id}, {item.Metadata}){{ RuntimeId = {item.RuntimeId}, ExtraData = {item.ExtraData}}},");
222216
}
223217
}
224218
Log.Warn($"[McpeCreativeContent] Done reading {message.input.Count} creative items\n");

src/MiNET/MiNET.Client/McpeClientMessageHandlerBase.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#endregion
2525

2626
using System;
27-
using System.Collections;
2827
using System.Collections.Generic;
2928
using System.Numerics;
3029
using System.Security.Cryptography;
@@ -34,12 +33,9 @@
3433
using MiNET.Net;
3534
using MiNET.Utils;
3635
using MiNET.Utils.Cryptography;
37-
using MiNET.Utils.Metadata;
3836
using MiNET.Utils.Vectors;
39-
using Newtonsoft.Json;
4037
using Org.BouncyCastle.Crypto.Parameters;
4138
using Org.BouncyCastle.Security;
42-
using static MiNET.Entities.Entity;
4339

4440
namespace MiNET.Client
4541
{
@@ -118,11 +114,11 @@ public virtual void HandleMcpeResourcePacksInfo(McpeResourcePacksInfo message)
118114
//response.responseStatus = 3;
119115
//SendPackage(response);
120116

121-
if (message.behahaviorpackinfos.Count != 0)
117+
if (message.texturepacks.Count != 0)
122118
{
123119
var resourcePackIds = new ResourcePackIds();
124120

125-
foreach (ResourcePackInfo packInfo in message.behahaviorpackinfos)
121+
foreach (ResourcePackInfo packInfo in message.texturepacks)
126122
{
127123
resourcePackIds.Add(packInfo.UUID);
128124
}
@@ -273,7 +269,7 @@ public virtual void HandleMcpeInventoryTransaction(McpeInventoryTransaction mess
273269

274270
public virtual void HandleMcpeMobEquipment(McpeMobEquipment message)
275271
{
276-
/*Log.Warn($"Entity with {message.runtimeEntityId} is holding {message.item.Name}");*/
272+
Log.Warn($"Entity with {message.runtimeEntityId} is holding {message.item.Name}");
277273
}
278274

279275
public virtual void HandleMcpeMobArmorEquipment(McpeMobArmorEquipment message)
@@ -292,7 +288,6 @@ public virtual void HandleMcpeSetEntityData(McpeSetEntityData message)
292288
{
293289
//Log.Warn(JsonConvert.SerializeObject(message, Formatting.Indented));
294290

295-
296291
/*if (message.metadata[0] == null) { return; }
297292
MetadataLong metadataLong = message.metadata[0] as MetadataLong;
298293
byte[] bytes = BitConverter.GetBytes(metadataLong.Value);

0 commit comments

Comments
 (0)