diff --git a/VirtualComputer/BUILDING.md b/VirtualComputer-Core/BUILDING.md similarity index 100% rename from VirtualComputer/BUILDING.md rename to VirtualComputer-Core/BUILDING.md diff --git a/VirtualComputer-Core/dependency-reduced-pom.xml b/VirtualComputer-Core/dependency-reduced-pom.xml new file mode 100644 index 0000000..91f01b0 --- /dev/null +++ b/VirtualComputer-Core/dependency-reduced-pom.xml @@ -0,0 +1,145 @@ + + + 4.0.0 + io.github.NorbiPeti + VirtualComputer-Core + 2.1-SNAPSHOT + + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + -g + + + + + maven-shade-plugin + 2.4.2 + + + package + + shade + + + + + + + + + + XPCOM + + + + maven-shade-plugin + + + package + + shade + + + + + org.virtualbox:VirtualBox-MSCOM + + + + + + + + + + + MSCOM + + + + maven-shade-plugin + + + package + + shade + + + + + org.virtualbox:VirtualBox + + + + + + + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + repo + file://${basedir}/repo + + + + + 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.virtualbox + VirtualBox-MSCOM + 6.0 + compile + + + org.bukkit + craftbukkit + 1.12.2-R0.1-SNAPSHOT + provided + + + + diff --git a/VirtualComputer/fix/IDisplaySourceBitmap.class b/VirtualComputer-Core/fix/IDisplaySourceBitmap.class similarity index 100% rename from VirtualComputer/fix/IDisplaySourceBitmap.class rename to VirtualComputer-Core/fix/IDisplaySourceBitmap.class diff --git a/VirtualComputer/fix/README b/VirtualComputer-Core/fix/README similarity index 100% rename from VirtualComputer/fix/README rename to VirtualComputer-Core/fix/README diff --git a/VirtualComputer/lombok.config b/VirtualComputer-Core/lombok.config similarity index 100% rename from VirtualComputer/lombok.config rename to VirtualComputer-Core/lombok.config diff --git a/VirtualComputer/pom.xml b/VirtualComputer-Core/pom.xml similarity index 98% rename from VirtualComputer/pom.xml rename to VirtualComputer-Core/pom.xml index fc2f807..5645b7b 100644 --- a/VirtualComputer/pom.xml +++ b/VirtualComputer-Core/pom.xml @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 io.github.NorbiPeti - VirtualComputer - 2.0-SNAPSHOT + VirtualComputer-Core + 2.1-SNAPSHOT diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox-MSCOM/6.0/VirtualBox-MSCOM-6.0.jar b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox-MSCOM/6.0/VirtualBox-MSCOM-6.0.jar similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox-MSCOM/6.0/VirtualBox-MSCOM-6.0.jar rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox-MSCOM/6.0/VirtualBox-MSCOM-6.0.jar diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox-MSCOM/6.0/VirtualBox-MSCOM-6.0.pom b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox-MSCOM/6.0/VirtualBox-MSCOM-6.0.pom similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox-MSCOM/6.0/VirtualBox-MSCOM-6.0.pom rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox-MSCOM/6.0/VirtualBox-MSCOM-6.0.pom diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox-MSCOM/maven-metadata-local.xml b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox-MSCOM/maven-metadata-local.xml similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox-MSCOM/maven-metadata-local.xml rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox-MSCOM/maven-metadata-local.xml diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1-javadoc.jar b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1-javadoc.jar similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1-javadoc.jar rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1-javadoc.jar diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.jar b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.jar similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.jar rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.jar diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.pom b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.pom similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.pom rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.1/VirtualBox-5.1.pom diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox/5.2/VirtualBox-5.2.jar b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.2/VirtualBox-5.2.jar similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox/5.2/VirtualBox-5.2.jar rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.2/VirtualBox-5.2.jar diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox/5.2/VirtualBox-5.2.pom b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.2/VirtualBox-5.2.pom similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox/5.2/VirtualBox-5.2.pom rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox/5.2/VirtualBox-5.2.pom diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox/6.0/VirtualBox-6.0.jar b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox/6.0/VirtualBox-6.0.jar similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox/6.0/VirtualBox-6.0.jar rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox/6.0/VirtualBox-6.0.jar diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox/6.0/VirtualBox-6.0.pom b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox/6.0/VirtualBox-6.0.pom similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox/6.0/VirtualBox-6.0.pom rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox/6.0/VirtualBox-6.0.pom diff --git a/VirtualComputer/repo/org/virtualbox/VirtualBox/maven-metadata-local.xml b/VirtualComputer-Core/repo/org/virtualbox/VirtualBox/maven-metadata-local.xml similarity index 100% rename from VirtualComputer/repo/org/virtualbox/VirtualBox/maven-metadata-local.xml rename to VirtualComputer-Core/repo/org/virtualbox/VirtualBox/maven-metadata-local.xml diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/Commands.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Commands.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/Commands.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Commands.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/Computer.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/Computer.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/MouseLockerPlayerListener.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/MouseLockerPlayerListener.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/MouseLockerPlayerListener.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/MouseLockerPlayerListener.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/PluginMain.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/PluginMain.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/PluginMain.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/Test.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Test.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/Test.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Test.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/events/EventHandlerBase.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/EventHandlerBase.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/events/EventHandlerBase.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/EventHandlerBase.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/events/MachineEventHandler.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/MachineEventHandler.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/events/MachineEventHandler.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/MachineEventHandler.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/events/VBoxEventHandler.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/VBoxEventHandler.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/events/VBoxEventHandler.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/events/VBoxEventHandler.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/BukkitRenderer.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/BukkitRenderer.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/BukkitRenderer.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/BukkitRenderer.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/GPURenderer.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/GPURenderer.java similarity index 99% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/GPURenderer.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/GPURenderer.java index 1d4c412..2bdfe3b 100644 --- a/VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/GPURenderer.java +++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/GPURenderer.java @@ -10,7 +10,6 @@ import org.bukkit.map.MapView; import sznp.virtualcomputer.PluginMain; import sznp.virtualcomputer.util.Timing; -import java.awt.*; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/GPURendererInternal.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/GPURendererInternal.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/GPURendererInternal.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/GPURendererInternal.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/IRenderer.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/IRenderer.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/IRenderer.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/IRenderer.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/util/COMObjectBase.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/COMObjectBase.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/util/COMObjectBase.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/COMObjectBase.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/util/PXCLib.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/PXCLib.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/util/PXCLib.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/PXCLib.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/util/Scancode.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/Scancode.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/util/Scancode.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/Scancode.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/util/Timing.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/Timing.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/util/Timing.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/Timing.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/util/Utils.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/Utils.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/util/Utils.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/Utils.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/util/VBoxLib.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/VBoxLib.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/util/VBoxLib.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/VBoxLib.java diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/util/WinLib.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/WinLib.java similarity index 100% rename from VirtualComputer/src/main/java/sznp/virtualcomputer/util/WinLib.java rename to VirtualComputer-Core/src/main/java/sznp/virtualcomputer/util/WinLib.java diff --git a/VirtualComputer/src/main/resources/plugin.yml b/VirtualComputer-Core/src/main/resources/plugin.yml similarity index 100% rename from VirtualComputer/src/main/resources/plugin.yml rename to VirtualComputer-Core/src/main/resources/plugin.yml diff --git a/VirtualComputer/.classpath b/VirtualComputer/.classpath deleted file mode 100644 index be86bf9..0000000 --- a/VirtualComputer/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/VirtualComputer/.project b/VirtualComputer/.project deleted file mode 100644 index 1645764..0000000 --- a/VirtualComputer/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - VirtualComputer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/VirtualComputer/.settings/org.eclipse.jdt.core.prefs b/VirtualComputer/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 124ac83..0000000 --- a/VirtualComputer/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/VirtualComputer/dependency-reduced-pom.xml b/VirtualComputer/dependency-reduced-pom.xml deleted file mode 100644 index 3e0d028..0000000 --- a/VirtualComputer/dependency-reduced-pom.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - 4.0.0 - io.github.NorbiPeti - VirtualComputer - 2.0-SNAPSHOT - - - - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - -g - - - - - maven-shade-plugin - 2.4.2 - - - package - - shade - - - - - - - - - - XPCOM - - - - maven-shade-plugin - - - package - - shade - - - - - org.virtualbox:VirtualBox-MSCOM - - - - - - - - - - - MSCOM - - - - maven-shade-plugin - - - package - - shade - - - - - org.virtualbox:VirtualBox - - - - - - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - repo - file://${basedir}/repo - - - - - 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.virtualbox - VirtualBox-MSCOM - 6.0 - compile - - - org.bukkit - craftbukkit - 1.12.2-R0.1-SNAPSHOT - provided - - - - diff --git a/VirtualComputerMSCOM/pom.xml b/VirtualComputerMSCOM/pom.xml new file mode 100644 index 0000000..1eff82e --- /dev/null +++ b/VirtualComputerMSCOM/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + sznp.virtualcomputer + VirtualComputer-MSCOM + 2.1-SNAPSHOT + + + io.github.NorbiPeti + VirtualComputer + 2.1-SNAPSHOT + + + \ No newline at end of file diff --git a/VirtualComputerXPCOM/pom.xml b/VirtualComputerXPCOM/pom.xml new file mode 100644 index 0000000..bb25a5d --- /dev/null +++ b/VirtualComputerXPCOM/pom.xml @@ -0,0 +1,15 @@ + + + + VirtualComputer + io.github.NorbiPeti + 2.1-SNAPSHOT + + 4.0.0 + + VirtualComputer-XPCOM + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..0803a46 --- /dev/null +++ b/pom.xml @@ -0,0 +1,81 @@ + + + + 4.0.0 + + io.github.NorbiPeti + VirtualComputer + 2.1-SNAPSHOT + + VirtualComputerXPCOM + VirtualComputer-Core + VirtualComputerMSCOM + + pom + + VirtualComputer + + http://www.example.com + + + UTF-8 + 1.8 + 1.8 + + + + + junit + junit + 4.11 + test + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + + + \ No newline at end of file