labymodapi bungee

drupijs · Apr 5, 2020 · f550746 · f550746
1 parent 9188108
commit f550746
Show file tree

Hide file tree

Showing 21 changed files with 84 additions and 15 deletions.
diff --git a/BungeeCord/BungeeCord.iml b/BungeeCord/BungeeCord.iml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../BungeeCord/target/classes" />
-    <output-test url="file://$MODULE_DIR$/../BungeeCord/target/test-classes" />
-    <content url="file://$MODULE_DIR$/../BungeeCord">
-      <sourceFolder url="file://$MODULE_DIR$/../BungeeCord/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../BungeeCord/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/../BungeeCord/target" />
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -42,5 +42,14 @@
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: io.socket:socket.io-client:1.0.0" level="project" />
     <orderEntry type="library" name="Maven: io.socket:engine.io-client:1.0.0" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../Spigot-Legacy/libs/LabyMod.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
diff --git a/BungeeCord/dependency-reduced-pom.xml b/BungeeCord/dependency-reduced-pom.xml
@@ -116,6 +116,13 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.github.LabyMod</groupId>
+      <artifactId>labymod-server-api</artifactId>
+      <version>LATEST</version>
+      <scope>system</scope>
+      <systemPath>${basedir}/libs/LabyMod.jar</systemPath>
+    </dependency>
   </dependencies>
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/BungeeCord/libs/LabyMod.jar b/BungeeCord/libs/LabyMod.jar
diff --git a/BungeeCord/pom.xml b/BungeeCord/pom.xml
@@ -78,6 +78,13 @@
             <version>2.3.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.LabyMod</groupId>
+            <artifactId>labymod-server-api</artifactId>
+            <version>LATEST</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/libs/LabyMod.jar</systemPath>
+        </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.json/json -->
         <dependency>

diff --git a/BungeeCord/src/main/java/hundeklemmen/bungeecord/MainPlugin.java b/BungeeCord/src/main/java/hundeklemmen/bungeecord/MainPlugin.java
@@ -5,13 +5,15 @@
 import hundeklemmen.bungeecord.Events.eventListener;
 import hundeklemmen.bungeecord.api.BungeeConfig;
 import hundeklemmen.bungeecord.script.*;
+import hundeklemmen.bungeecord.script.labymod.LabymodEvents;
 import hundeklemmen.shared.api.Drupi;
 import hundeklemmen.shared.api.DrupiScript;
 import hundeklemmen.shared.api.Platform;
 import hundeklemmen.shared.api.interfaces.ScriptLoadMessage;
 import hundeklemmen.shared.api.interfaces.SetupMessage;
 import io.socket.client.Socket;
 import jdk.nashorn.api.scripting.NashornScriptEngine;
+import net.labymod.serverapi.bungee.LabyModPlugin;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -140,6 +142,12 @@ public void onError(String error){
         drupi.registerManager("socket", new socketManager(instance));
         drupi.registerManager("Express", new ExpressManager(instance));
 
+        if (instance.getProxy().getPluginManager().getPlugin("LabyModAPI") != null) {
+            drupi.log.info("LabyModAPI found, activating LabyModAPI expansion class.");
+            drupi.registerManager("LabyModAPI", LabyModPlugin.getInstance());
+            instance.getProxy().getPluginManager().registerListener(instance, new LabymodEvents(drupi));
+        }
+
         drupi.Setup(new SetupMessage() {
             @Override
             public void onMessage(String message) {

diff --git a/BungeeCord/src/main/java/hundeklemmen/bungeecord/script/labymod/LabymodEvents.java b/BungeeCord/src/main/java/hundeklemmen/bungeecord/script/labymod/LabymodEvents.java
@@ -0,0 +1,38 @@
+package hundeklemmen.bungeecord.script.labymod;
+
+import hundeklemmen.shared.api.Drupi;
+import net.labymod.serverapi.bungee.event.LabyModPlayerJoinEvent;
+import net.labymod.serverapi.bungee.event.MessageReceiveEvent;
+import net.labymod.serverapi.bungee.event.MessageSendEvent;
+import net.labymod.serverapi.bungee.event.PermissionsSendEvent;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+
+public class LabymodEvents implements Listener {
+
+    private Drupi drupi;
+
+    public LabymodEvents(Drupi drupi){
+        this.drupi = drupi;
+    }
+
+    @EventHandler
+    public void LabyMessageReceive(MessageReceiveEvent event){
+        drupi.callEvent("LabyModMessageReceiveEvent", event);
+    }
+
+    @EventHandler
+    public void LabyModPlayerJoin(LabyModPlayerJoinEvent event){
+        drupi.callEvent("LabyModLabyModPlayerJoinEvent", event);
+    }
+
+    @EventHandler
+    public void PermissionsSend(PermissionsSendEvent event){
+        drupi.callEvent("LabyModPermissionsSendEvent", event);
+    }
+
+    @EventHandler
+    public void MessageSend(MessageSendEvent event){
+        drupi.callEvent("LabyModMessageSendEvent", event);
+    }
+}
diff --git a/BungeeCord/src/main/resources/plugin.yml b/BungeeCord/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Drupi
 main: hundeklemmen.bungeecord.MainPlugin
-version: "0.4.2"
+version: "0.4.3"
 author: "Hundeklemmen"
 description: "Minecraft development made easy."
 website: "https://stacket.net/drupi"
diff --git a/Spigot-Legacy/Spigot-Legacy.iml b/Spigot-Legacy/Spigot-Legacy.iml
@@ -20,7 +20,7 @@
     <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
     <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.5" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="module" module-name="version.v1.8" />

diff --git a/Spigot-Legacy/src/main/resources/plugin.yml b/Spigot-Legacy/src/main/resources/plugin.yml
@@ -2,7 +2,7 @@ name: Drupi
 api: "1.0.0"
 main: hundeklemmen.legacy.MainPlugin
 author: ["Hundeklemmen", "Stacket"]
-version: "0.4.2"
+version: "0.4.3"
 description: "Minecraft development made easy."
 website: "https://stacket.net/drupi"
 softdepend: [PlaceholderAPI, WorldGuard, Holograms, Skript, TitleManager, LabyModAPI]

diff --git a/version.v1_10/target/maven-archiver/pom.properties b/version.v1_10/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Mar 26 21:56:13 CET 2020
+#Sun Apr 05 16:11:26 CEST 2020
 version=1.10.0
 groupId=drupi.xyz
 artifactId=version.v1.10
diff --git a/version.v1_10/target/version.v1.10-1.10.0.jar b/version.v1_10/target/version.v1.10-1.10.0.jar
diff --git a/version.v1_11/target/maven-archiver/pom.properties b/version.v1_11/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Mar 26 21:56:14 CET 2020
+#Sun Apr 05 16:11:27 CEST 2020
 version=1.11.0
 groupId=drupi.xyz
 artifactId=version.v1.11
diff --git a/version.v1_11/target/version.v1.11-1.11.0.jar b/version.v1_11/target/version.v1.11-1.11.0.jar
diff --git a/version.v1_12/target/maven-archiver/pom.properties b/version.v1_12/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Mar 26 21:56:15 CET 2020
+#Sun Apr 05 16:11:27 CEST 2020
 version=1.12.0
 groupId=drupi.xyz
 artifactId=version.v1.12
diff --git a/version.v1_12/target/version.v1.12-1.12.0.jar b/version.v1_12/target/version.v1.12-1.12.0.jar
diff --git a/version.v1_13/target/maven-archiver/pom.properties b/version.v1_13/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Mar 26 21:56:17 CET 2020
+#Sun Apr 05 16:11:29 CEST 2020
 version=1.13.0
 groupId=drupi.xyz
 artifactId=version.v1.13
diff --git a/version.v1_13/target/version.v1.13-1.13.0.jar b/version.v1_13/target/version.v1.13-1.13.0.jar
diff --git a/version.v1_8/target/maven-archiver/pom.properties b/version.v1_8/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Mar 26 21:56:12 CET 2020
+#Sun Apr 05 16:11:24 CEST 2020
 version=1.8.8
 groupId=drupi.xyz
 artifactId=version.v1.8
diff --git a/version.v1_8/target/version.v1.8-1.8.8.jar b/version.v1_8/target/version.v1.8-1.8.8.jar
diff --git a/version.v1_9/target/maven-archiver/pom.properties b/version.v1_9/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Mar 26 21:56:13 CET 2020
+#Sun Apr 05 16:11:25 CEST 2020
 version=1.9.0
 groupId=drupi.xyz
 artifactId=version.v1.9
diff --git a/version.v1_9/target/version.v1.9-1.9.0.jar b/version.v1_9/target/version.v1.9-1.9.0.jar