diff --git a/VirtualComputer-Core/dependency-reduced-pom.xml b/VirtualComputer-Core/dependency-reduced-pom.xml index 52d04e8..aba4167 100644 --- a/VirtualComputer-Core/dependency-reduced-pom.xml +++ b/VirtualComputer-Core/dependency-reduced-pom.xml @@ -1,6 +1,5 @@ - + VirtualComputer io.github.NorbiPeti @@ -24,14 +23,14 @@ maven-shade-plugin - 2.4.2 + 3.2.4 package shade - + @@ -104,7 +103,7 @@ org.virtualbox VirtualBox-MSCOM - 6.0 + 6.1 compile @@ -125,38 +124,23 @@ + + org.projectlombok + lombok + 1.18.12 + provided + org.spigotmc spigot-api 1.12-R0.1-SNAPSHOT provided - - - commons-lang - commons-lang - - - json-simple - com.googlecode.json-simple - - - guava - com.google.guava - - - gson - com.google.code.gson - - - snakeyaml - org.yaml - - - bungeecord-chat - net.md-5 - - + + + org.spigotmc + spigot + 1.16.1-R0.1-SNAPSHOT + provided - diff --git a/VirtualComputer-Core/pom.xml b/VirtualComputer-Core/pom.xml index 80f5d3e..83cfd9d 100644 --- a/VirtualComputer-Core/pom.xml +++ b/VirtualComputer-Core/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.2 + 3.2.4 package @@ -42,7 +42,7 @@ org.virtualbox VirtualBox-MSCOM - 6.0 + 6.1 com.aparapi diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Commands.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Commands.java index a92868b..4df9fc5 100644 --- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Commands.java +++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Commands.java @@ -5,7 +5,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.virtualbox_6_0.VBoxException; +import org.virtualbox_6_1.VBoxException; public class Commands implements CommandExecutor { diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java index 21eade2..b313721 100644 --- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java +++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java @@ -5,7 +5,7 @@ import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import org.virtualbox_6_0.*; +import org.virtualbox_6_1.*; import sznp.virtualcomputer.events.MachineEventHandler; import sznp.virtualcomputer.events.VBoxEventHandler; import sznp.virtualcomputer.renderer.GPURenderer; @@ -136,7 +136,7 @@ public final class Computer { return; sendMessage(sender, "§eFixing screen..."); session.getConsole().getDisplay().setSeamlessMode(false); - session.getConsole().getDisplay().setVideoModeHint(0L, true, false, 0, 0, 640L, 480L, 32L); + session.getConsole().getDisplay().setVideoModeHint(0L, true, false, 0, 0, 640L, 480L, 32L, true); sendMessage(sender, "§eScreen fixed."); } diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java index 00099b4..e92bb03 100644 --- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java +++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java @@ -6,8 +6,8 @@ import org.bukkit.Bukkit; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitTask; -import org.virtualbox_6_0.IVirtualBox; -import org.virtualbox_6_0.VirtualBoxManager; +import org.virtualbox_6_1.IVirtualBox; +import org.virtualbox_6_1.VirtualBoxManager; import sznp.virtualcomputer.events.VBoxEventHandler; import sznp.virtualcomputer.renderer.BukkitRenderer; import sznp.virtualcomputer.renderer.GPURenderer; diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/EventHandlerBase.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/EventHandlerBase.java index 16757c1..32f286d 100644 --- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/EventHandlerBase.java +++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/EventHandlerBase.java @@ -2,9 +2,9 @@ package sznp.virtualcomputer.events; import lombok.val; import org.bukkit.Bukkit; -import org.virtualbox_6_0.IEvent; -import org.virtualbox_6_0.IEventSource; -import org.virtualbox_6_0.VBoxEventType; +import org.virtualbox_6_1.IEvent; +import org.virtualbox_6_1.IEventSource; +import org.virtualbox_6_1.VBoxEventType; import sznp.virtualcomputer.util.COMUtils; import sznp.virtualcomputer.util.IEventHandler; @@ -20,10 +20,10 @@ public abstract class EventHandlerBase implements IEventHandler { /** * The events to listen for. It will only look for these handlers. */ - private final Map> eventMap; + private final Map> eventMap; private boolean enabled = true; - protected EventHandlerBase(Map> eventMap) { + protected EventHandlerBase(Map> eventMap) { this.eventMap = eventMap; } @@ -50,7 +50,7 @@ public abstract class EventHandlerBase implements IEventHandler { } } - public org.virtualbox_6_0.IEventListener registerTo(IEventSource source) { + public org.virtualbox_6_1.IEventListener registerTo(IEventSource source) { return COMUtils.registerListener(source, this, new ArrayList<>(eventMap.keySet())); } diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/MachineEventHandler.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/MachineEventHandler.java index 259ae17..ecefe3f 100644 --- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/MachineEventHandler.java +++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/MachineEventHandler.java @@ -6,9 +6,9 @@ import lombok.experimental.var; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.event.EventHandler; -import org.virtualbox_6_0.IProgress; -import org.virtualbox_6_0.IStateChangedEvent; -import org.virtualbox_6_0.VBoxEventType; +import org.virtualbox_6_1.IProgress; +import org.virtualbox_6_1.IStateChangedEvent; +import org.virtualbox_6_1.VBoxEventType; import sznp.virtualcomputer.Computer; import sznp.virtualcomputer.PluginMain; diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/VBoxEventHandler.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/VBoxEventHandler.java index 3a597f5..cf66d24 100644 --- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/VBoxEventHandler.java +++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/VBoxEventHandler.java @@ -4,9 +4,9 @@ import com.google.common.collect.ImmutableMap; import lombok.Getter; import org.bukkit.command.CommandSender; import org.bukkit.event.EventHandler; -import org.virtualbox_6_0.ISessionStateChangedEvent; -import org.virtualbox_6_0.SessionState; -import org.virtualbox_6_0.VBoxEventType; +import org.virtualbox_6_1.ISessionStateChangedEvent; +import org.virtualbox_6_1.SessionState; +import org.virtualbox_6_1.VBoxEventType; import sznp.virtualcomputer.Computer; public class VBoxEventHandler extends EventHandlerBase { diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java index 3589d47..4af3520 100644 --- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java +++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java @@ -4,10 +4,10 @@ import com.sun.jna.Pointer; import lombok.RequiredArgsConstructor; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; -import org.virtualbox_6_0.Holder; -import org.virtualbox_6_0.IDisplay; -import org.virtualbox_6_0.IDisplaySourceBitmap; -import org.virtualbox_6_0.VBoxException; +import org.virtualbox_6_1.Holder; +import org.virtualbox_6_1.IDisplay; +import org.virtualbox_6_1.IDisplaySourceBitmap; +import org.virtualbox_6_1.VBoxException; import sznp.virtualcomputer.PluginMain; import sznp.virtualcomputer.util.COMUtils; import sznp.virtualcomputer.util.IMCFrameBuffer; @@ -16,7 +16,7 @@ import sznp.virtualcomputer.util.Timing; @RequiredArgsConstructor public class MCFrameBuffer implements IMCFrameBuffer { private final IDisplay display; - private Holder holder = new Holder<>(); + private final Holder holder = new Holder<>(); private BukkitTask tt; private Pointer pointer; private int width; diff --git a/VirtualComputerMSCOM/pom.xml b/VirtualComputerMSCOM/pom.xml index 174fe9e..2f4ef83 100644 --- a/VirtualComputerMSCOM/pom.xml +++ b/VirtualComputerMSCOM/pom.xml @@ -18,7 +18,7 @@ org.virtualbox VirtualBox-MSCOM - 6.0 + 6.1 true diff --git a/VirtualComputerXPCOM/pom.xml b/VirtualComputerXPCOM/pom.xml index 5ac1437..083a02e 100644 --- a/VirtualComputerXPCOM/pom.xml +++ b/VirtualComputerXPCOM/pom.xml @@ -15,7 +15,7 @@ org.virtualbox VirtualBox - 6.0 + 6.1 true diff --git a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/COMFrameBuffer.java b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/COMFrameBuffer.java index 2226561..07bc53b 100644 --- a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/COMFrameBuffer.java +++ b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/COMFrameBuffer.java @@ -5,8 +5,8 @@ import org.mozilla.interfaces.IFramebuffer; import org.mozilla.interfaces.IFramebufferOverlay; import org.mozilla.interfaces.nsISupports; import org.mozilla.xpcom.Mozilla; -import org.virtualbox_6_0.BitmapFormat; -import org.virtualbox_6_0.FramebufferCapabilities; +import org.virtualbox_6_1.BitmapFormat; +import org.virtualbox_6_1.FramebufferCapabilities; import sznp.virtualcomputer.util.IMCFrameBuffer; import java.util.Arrays; diff --git a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/EventHandler.java b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/EventHandler.java index e74bb66..b0e42c4 100644 --- a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/EventHandler.java +++ b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/EventHandler.java @@ -25,7 +25,7 @@ public final class EventHandler extends COMObjectBase implements IEventListener public final void handleEvent(IEvent iEvent) { if (!enabled) return; - handler.handleEvent(new org.virtualbox_6_0.IEvent(iEvent)); + handler.handleEvent(new org.virtualbox_6_1.IEvent(iEvent)); } public void disable() { diff --git a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/COMUtils.java b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/COMUtils.java index 266004f..156897b 100644 --- a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/COMUtils.java +++ b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/COMUtils.java @@ -1,8 +1,8 @@ package sznp.virtualcomputer.util; import lombok.val; -import org.virtualbox_6_0.*; -import org.virtualbox_6_0.xpcom.IUnknown; +import org.virtualbox_6_1.*; +import org.virtualbox_6_1.xpcom.IUnknown; import sznp.virtualcomputer.COMFrameBuffer; import sznp.virtualcomputer.EventHandler; @@ -14,8 +14,8 @@ public final class COMUtils { } //public static void registerListener(IEventSource source, IEventListener listener, VBoxEventType... types) { - public static org.virtualbox_6_0.IEventListener registerListener(IEventSource source, IEventHandler listener, List types) { - val ret = new org.virtualbox_6_0.IEventListener(new EventHandler(listener)); + public static org.virtualbox_6_1.IEventListener registerListener(IEventSource source, IEventHandler listener, List types) { + val ret = new org.virtualbox_6_1.IEventListener(new EventHandler(listener)); source.registerListener(ret, types, true); return ret; } diff --git a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/IEventHandler.java b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/IEventHandler.java index 6c2dc19..7a61468 100644 --- a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/IEventHandler.java +++ b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/IEventHandler.java @@ -1,6 +1,6 @@ package sznp.virtualcomputer.util; -import org.virtualbox_6_0.IEvent; +import org.virtualbox_6_1.IEvent; public interface IEventHandler { void handleEvent(IEvent iEvent); diff --git a/pom.xml b/pom.xml index 98d78ce..bd7eea9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ repo - file://${basedir}/repo + file://${basedir}/../repo spigot-repo @@ -45,7 +45,8 @@ org.projectlombok lombok - 1.16.16 + 1.18.12 + provided @@ -70,12 +71,12 @@ 1.12-R0.1-SNAPSHOT provided - + org.spigotmc + spigot + 1.16.1-R0.1-SNAPSHOT provided - --> + diff --git a/repo/org/virtualbox/VirtualBox-MSCOM/maven-metadata-local.xml b/repo/org/virtualbox/VirtualBox-MSCOM/maven-metadata-local.xml index 10d70c9..a3c96ca 100644 --- a/repo/org/virtualbox/VirtualBox-MSCOM/maven-metadata-local.xml +++ b/repo/org/virtualbox/VirtualBox-MSCOM/maven-metadata-local.xml @@ -1,12 +1,13 @@ - org.virtualbox - VirtualBox-MSCOM - - 6.0 - - 6.0 - - 20190405225845 - + org.virtualbox + VirtualBox-MSCOM + + 6.1 + + 6.0 + 6.1 + + 20200731215317 + diff --git a/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1-javadoc.jar b/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1-javadoc.jar index 4ea760b..6a730cc 100644 Binary files a/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1-javadoc.jar and b/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1-javadoc.jar differ diff --git a/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.jar b/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.jar index b0bd4ee..b0777fa 100644 Binary files a/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.jar and b/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.jar differ diff --git a/repo/org/virtualbox/VirtualBox/maven-metadata-local.xml b/repo/org/virtualbox/VirtualBox/maven-metadata-local.xml index 9841bc8..7461604 100644 --- a/repo/org/virtualbox/VirtualBox/maven-metadata-local.xml +++ b/repo/org/virtualbox/VirtualBox/maven-metadata-local.xml @@ -1,14 +1,15 @@ - org.virtualbox - VirtualBox - - 6.0 - - 5.1 - 5.2 - 6.0 - - 20181221211412 - + org.virtualbox + VirtualBox + + 6.1 + + 5.1 + 5.2 + 6.0 + 6.1 + + 20200731194146 +