From 3da76f075f67c051e644b4dd50a57b69a3968c2e Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Mon, 8 Apr 2019 15:44:44 +0200
Subject: [PATCH] Conditional shading

---
 VirtualComputer/pom.xml                       | 77 ++++++++++++++-----
 .../java/sznp/virtualcomputer/PluginMain.java |  2 +-
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/VirtualComputer/pom.xml b/VirtualComputer/pom.xml
index 8dd459e..fc2f807 100644
--- a/VirtualComputer/pom.xml
+++ b/VirtualComputer/pom.xml
@@ -57,11 +57,16 @@
 			<version>6.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.bukkit</groupId>
-			<artifactId>craftbukkit</artifactId>
-			<version>1.12.2-R0.1-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
+            <groupId>org.virtualbox</groupId>
+            <artifactId>VirtualBox-MSCOM</artifactId>
+            <version>6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
 		<!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna -->
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
@@ -90,26 +95,56 @@
 			<version>3.0.0</version>
 		</dependency>
 	</dependencies>
-	<!-- <profiles>
+    <profiles>
 		<profile>
 			<id>XPCOM</id>
-			<dependencies>
-				<dependency>
-					<groupId>org.virtualbox</groupId>
-					<artifactId>VirtualBox</artifactId>
-					<version>6.0</version>
-				</dependency>
-			</dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-shade-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>shade</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactSet>
+                                        <excludes>
+                                            <exclude>org.virtualbox:VirtualBox-MSCOM</exclude>
+                                        </excludes>
+                                    </artifactSet>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
 		</profile>
 		<profile>
 			<id>MSCOM</id>
-			<dependencies>
-				<dependency>
-					<groupId>org.virtualbox</groupId>
-					<artifactId>VirtualBox-MSCOM</artifactId>
-					<version>6.0</version>
-				</dependency>
-			</dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-shade-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>shade</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactSet>
+                                        <excludes>
+                                            <exclude>org.virtualbox:VirtualBox</exclude>
+                                        </excludes>
+                                    </artifactSet>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
 		</profile>
-	</profiles> -->
+    </profiles>
 </project>
\ No newline at end of file
diff --git a/VirtualComputer/src/main/java/sznp/virtualcomputer/PluginMain.java b/VirtualComputer/src/main/java/sznp/virtualcomputer/PluginMain.java
index c9898f2..427c400 100644
--- a/VirtualComputer/src/main/java/sznp/virtualcomputer/PluginMain.java
+++ b/VirtualComputer/src/main/java/sznp/virtualcomputer/PluginMain.java
@@ -67,7 +67,7 @@ public class PluginMain extends JavaPlugin {
 				System.setProperty("java.library.path", vbpath);
 			Utils.addLibraryPath(vbpath);
 			final VirtualBoxManager manager = VirtualBoxManager.createInstance(getDataFolder().getAbsolutePath());
-			VBoxLib vbl = LibraryLoader.create(VBoxLib.class).load("vboxjxpcom");
+			VBoxLib vbl = LibraryLoader.create(VBoxLib.class).load("vboxjxpcom"); //TODO: Test for MSCOM
 			vbl.RTR3InitExe(0, "", 0);
 			IVirtualBox vbox = manager.getVBox();
 			listener = new VBoxEventHandler().registerTo(vbox.getEventSource());