helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Implemented .net 10 support. Updated all affected libraries and the code. Not testes yet.

Browse source
This commit is contained in:
Anon 2026-03-21 20:07:20 +01:00
parent 5488140261
commit 28834e7a86
10 changed files with 107 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

28
MinecraftClient/Scripting/DynamicRun/Builder/Compiler.cs
View file

@ -7,7 +7,6 @@ https://github.com/laurentkempe/DynamicRun/blob/master/LICENSE
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.MemoryMappedFiles;
using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
@ -117,10 +116,11 @@ namespace MinecraftClient.Scripting.DynamicRun.Builder
File.Copy(executablePath, tempFile);
// Access the contents of the executable.
ExecutableReader e = new();
var viewAccessor = MemoryMappedFile.CreateFromFile(tempFile, FileMode.Open).CreateViewAccessor();
var manifest = e.ReadManifest(viewAccessor);
var files = manifest.Files;
using ExecutableReader executableReader = new(tempFile);
if (!executableReader.IsSingleFile)
throw new InvalidOperationException("[Script Error] The executable is not a single-file bundle.");
var files = executableReader.Bundle.Files;
Stream? assemblyStream;
@ -133,8 +133,8 @@ namespace MinecraftClient.Scripting.DynamicRun.Builder
if (string.IsNullOrEmpty(loadedAssembly.Location)) {
// Check if we can access the file from the executable.
var reference = files.FirstOrDefault(x =>
x.RelativePath.Remove(x.RelativePath.Length - 4) == refs.Name);
var refCount = files.Count(x => x.RelativePath.Remove(x.RelativePath.Length - 4) == refs.Name);
Path.GetFileNameWithoutExtension(x.RelativePath) == refs.Name);
var refCount = files.Count(x => Path.GetFileNameWithoutExtension(x.RelativePath) == refs.Name);
if (refCount > 1) {
// Safety net for the case where the assembly is referenced multiple times.
// Should not happen normally, but we can make exceptions when it does happen.
@ -147,17 +147,13 @@ namespace MinecraftClient.Scripting.DynamicRun.Builder
"[Script Error] The executable does not contain a referenced assembly. Assembly name: " + refs.Name);
}
assemblyStream = GetStreamForFileEntry(viewAccessor, reference);
assemblyStream = reference.AsStream();
references.Add(MetadataReference.CreateFromStream(assemblyStream!));
continue;
}
references.Add(MetadataReference.CreateFromFile(loadedAssembly.Location));
}
// Cleanup.
viewAccessor.Flush();
viewAccessor.Dispose();
}
else
{
@ -176,14 +172,6 @@ namespace MinecraftClient.Scripting.DynamicRun.Builder
assemblyIdentityComparer: DesktopAssemblyIdentityComparer.Default));
}
private static Stream? GetStreamForFileEntry(MemoryMappedViewAccessor viewAccessor, FileEntry file)
{
if (typeof(BundleExtractor).GetMethod("GetStreamForFileEntry", BindingFlags.NonPublic | BindingFlags.Static)!.Invoke(null, new object[] { viewAccessor, file }) is not Stream stream)
throw new InvalidOperationException("[Script Error] The executable does not contain the assembly. Assembly name: " + file.RelativePath);
return stream;
}
internal struct CompileResult
{
internal byte[]? Assembly;