diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java index 02b9b11..9d5ace5 100644 --- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java +++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java @@ -93,9 +93,7 @@ public class PluginMain extends JavaPlugin { } } ccs.sendMessage("§bInitializing bridge..."); - Bridge.setVerbose(true); Bridge.init(getDataFolder().getAbsoluteFile()); - Bridge.getSetup().setVeryVerbose(true); Bridge.LoadAndRegisterAssemblyFrom(new File(getDataFolder(), "VirtualComputerWindows.j4n.dll")); } final VirtualBoxManager manager = VirtualBoxManager.createInstance(getDataFolder().getAbsolutePath()); diff --git a/VirtualComputerMSCOM/pom.xml b/VirtualComputerMSCOM/pom.xml index 3be9a25..2a77e96 100644 --- a/VirtualComputerMSCOM/pom.xml +++ b/VirtualComputerMSCOM/pom.xml @@ -29,7 +29,7 @@ io.github.NorbiPeti VirtualComputer-Windows - 0.8.9.0 + 3.0 net.sf.jacob-project diff --git a/VirtualComputerMSCOM/src/main/resources/Interop.VirtualBox.dll b/VirtualComputerMSCOM/src/main/resources/Interop.VirtualBox.dll index 576c982..c298bc8 100644 Binary files a/VirtualComputerMSCOM/src/main/resources/Interop.VirtualBox.dll and b/VirtualComputerMSCOM/src/main/resources/Interop.VirtualBox.dll differ diff --git a/VirtualComputerMSCOM/src/main/resources/VirtualComputerWindows.dll b/VirtualComputerMSCOM/src/main/resources/VirtualComputerWindows.dll index e0f1284..305c13f 100644 Binary files a/VirtualComputerMSCOM/src/main/resources/VirtualComputerWindows.dll and b/VirtualComputerMSCOM/src/main/resources/VirtualComputerWindows.dll differ diff --git a/VirtualComputerMSCOM/src/main/resources/VirtualComputerWindows.j4n.dll b/VirtualComputerMSCOM/src/main/resources/VirtualComputerWindows.j4n.dll index bd5ff3a..0725c9b 100644 Binary files a/VirtualComputerMSCOM/src/main/resources/VirtualComputerWindows.j4n.dll and b/VirtualComputerMSCOM/src/main/resources/VirtualComputerWindows.j4n.dll differ diff --git a/VirtualComputerMSCOM/src/main/resources/jacob-1.19-x64.dll b/VirtualComputerMSCOM/src/main/resources/jacob-1.19-x64.dll new file mode 100644 index 0000000..b0be352 Binary files /dev/null and b/VirtualComputerMSCOM/src/main/resources/jacob-1.19-x64.dll differ diff --git a/VirtualComputerMSCOM/src/main/resources/jacob-1.19-x86.dll b/VirtualComputerMSCOM/src/main/resources/jacob-1.19-x86.dll new file mode 100644 index 0000000..e6ede41 Binary files /dev/null and b/VirtualComputerMSCOM/src/main/resources/jacob-1.19-x86.dll differ diff --git a/VirtualComputerMSCOM/src/main/resources/jni4net.n-0.8.9.0.dll b/VirtualComputerMSCOM/src/main/resources/jni4net.n-0.8.9.0.dll index 5dfa06c..7aa3947 100644 Binary files a/VirtualComputerMSCOM/src/main/resources/jni4net.n-0.8.9.0.dll and b/VirtualComputerMSCOM/src/main/resources/jni4net.n-0.8.9.0.dll differ diff --git a/VirtualComputerWindows/VirtualComputerWindows/Exports.cs b/VirtualComputerWindows/VirtualComputerWindows/Exports.cs index e928ae1..5d59ee9 100644 --- a/VirtualComputerWindows/VirtualComputerWindows/Exports.cs +++ b/VirtualComputerWindows/VirtualComputerWindows/Exports.cs @@ -17,7 +17,7 @@ namespace VirtualComputerWindows private static VirtualBoxClient vbc; - public static void Init() + private static void Init() { try { @@ -48,7 +48,9 @@ namespace VirtualComputerWindows private static void Main() { - Init(); + //Init(); + long asd = GetEventHandler(null); + Console.WriteLine("Returned: " + asd); Console.ReadLine(); } @@ -56,13 +58,13 @@ namespace VirtualComputerWindows public static long GetFrameBuffer(IMCFrameBuffer framebuffer) { var fb = new WinFrameBuffer(framebuffer); - return (long) Marshal.GetIDispatchForObject(fb); + return (long) Marshal.GetIUnknownForObject(fb); } public static long GetEventHandler(IEventHandler handler) { var han = new EventHandler(handler); - return (long) Marshal.GetIDispatchForObject(han); + return (long)Marshal.GetIUnknownForObject(han); } } } diff --git a/repo/io/github/NorbiPeti/VirtualComputer-Windows/0.8.9.0/VirtualComputer-Windows-0.8.9.0.jar b/repo/io/github/NorbiPeti/VirtualComputer-Windows/0.8.9.0/VirtualComputer-Windows-0.8.9.0.jar deleted file mode 100644 index 1528bb3..0000000 Binary files a/repo/io/github/NorbiPeti/VirtualComputer-Windows/0.8.9.0/VirtualComputer-Windows-0.8.9.0.jar and /dev/null differ diff --git a/repo/io/github/NorbiPeti/VirtualComputer-Windows/3.0/VirtualComputer-Windows-3.0.jar b/repo/io/github/NorbiPeti/VirtualComputer-Windows/3.0/VirtualComputer-Windows-3.0.jar new file mode 100644 index 0000000..6edd735 Binary files /dev/null and b/repo/io/github/NorbiPeti/VirtualComputer-Windows/3.0/VirtualComputer-Windows-3.0.jar differ diff --git a/repo/io/github/NorbiPeti/VirtualComputer-Windows/0.8.9.0/VirtualComputer-Windows-0.8.9.0.pom b/repo/io/github/NorbiPeti/VirtualComputer-Windows/3.0/VirtualComputer-Windows-3.0.pom similarity index 94% rename from repo/io/github/NorbiPeti/VirtualComputer-Windows/0.8.9.0/VirtualComputer-Windows-0.8.9.0.pom rename to repo/io/github/NorbiPeti/VirtualComputer-Windows/3.0/VirtualComputer-Windows-3.0.pom index f2a6c0e..9b3c1c6 100644 --- a/repo/io/github/NorbiPeti/VirtualComputer-Windows/0.8.9.0/VirtualComputer-Windows-0.8.9.0.pom +++ b/repo/io/github/NorbiPeti/VirtualComputer-Windows/3.0/VirtualComputer-Windows-3.0.pom @@ -4,6 +4,6 @@ 4.0.0 io.github.NorbiPeti VirtualComputer-Windows - 0.8.9.0 + 3.0 POM was created from install:install-file diff --git a/repo/io/github/NorbiPeti/VirtualComputer-Windows/maven-metadata-local.xml b/repo/io/github/NorbiPeti/VirtualComputer-Windows/maven-metadata-local.xml index e195cc4..198005c 100644 --- a/repo/io/github/NorbiPeti/VirtualComputer-Windows/maven-metadata-local.xml +++ b/repo/io/github/NorbiPeti/VirtualComputer-Windows/maven-metadata-local.xml @@ -3,9 +3,9 @@ io.github.NorbiPeti VirtualComputer-Windows - 0.8.9.0 + 3.0 - 0.8.9.0 + 3.0 20201121164706