From fb4d4b1da5dc871e8ac79a329970a925b9e84649 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Mon, 4 Jun 2018 11:54:52 +0100 Subject: [PATCH] Updated build --- build.gradle | 12 +++++++++--- .../sekwah/advancedportals/core/CoreListeners.java | 5 +---- .../core/repository/ConfigRepositoryImpl.java | 3 +-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 743668a5..fa6904de 100644 --- a/build.gradle +++ b/build.gradle @@ -422,11 +422,17 @@ if (!isCanary) { publish.finalizedBy 'curseforge' } +jar { + from configurations.includeLibs.collect { it.isDirectory() ? it : zipTree(it) } +} + // Set SPIGOT_LOC to the location of your server and SPIGOT_JAR as the name of the jar file in the server you want to run task runJar() << { javaexec { - main="-jar"; args "${System.env.SPIGOT_LOC}\\${System.env.SPIGOT_JAR}.jar"; - workingDir = "${System.env.SPIGOT_LOC}"; + main "-jar" + args "${System.env.SPIGOT_LOC}\\${System.env.SPIGOT_JAR}.jar" + jvmArgs "-DIReallyKnowWhatIAmDoingISwear=true" + workingDir "${System.env.SPIGOT_LOC}" } -} +} \ No newline at end of file diff --git a/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java b/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java index 97fe9dd4..22a250ad 100644 --- a/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java +++ b/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java @@ -1,18 +1,15 @@ package com.sekwah.advancedportals.core; +import com.google.inject.Inject; import com.google.inject.name.Named; import com.sekwah.advancedportals.core.api.services.PortalServices; import com.sekwah.advancedportals.core.api.services.PortalTempDataServices; import com.sekwah.advancedportals.core.entities.PlayerLocation; import com.sekwah.advancedportals.core.entities.PortalLocation; -import com.sekwah.advancedportals.core.repository.PortalRepository; -import com.sekwah.advancedportals.core.repository.PortalTempDataRepository; import com.sekwah.advancedportals.core.util.Lang; import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.coreconnector.container.WorldContainer; -import javax.inject.Inject; - public class CoreListeners { private PortalTempDataServices portalTempDataServices; diff --git a/src/main/java/com/sekwah/advancedportals/core/repository/ConfigRepositoryImpl.java b/src/main/java/com/sekwah/advancedportals/core/repository/ConfigRepositoryImpl.java index e0fa687b..7129f97d 100644 --- a/src/main/java/com/sekwah/advancedportals/core/repository/ConfigRepositoryImpl.java +++ b/src/main/java/com/sekwah/advancedportals/core/repository/ConfigRepositoryImpl.java @@ -1,10 +1,9 @@ package com.sekwah.advancedportals.core.repository; +import com.google.inject.Singleton; import com.sekwah.advancedportals.core.config.Config; import com.sekwah.advancedportals.core.data.DataStorage; -import javax.inject.Singleton; - @Singleton public class ConfigRepositoryImpl implements ConfigRepository {