Skip to content

Commit 261ee00

Browse files
committed
fix: using pdm in more repos & timed startup
1 parent 23b8711 commit 261ee00

2 files changed

Lines changed: 53 additions & 22 deletions

File tree

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
group 'com.nextplugins'
11-
version '1.0.0'
11+
version '1.0.1'
1212

1313
tasks.build.dependsOn('pdm', 'shadowJar')
1414

@@ -26,12 +26,15 @@ repositories {
2626

2727
dependencies {
2828
compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT'
29+
compile 'org.quartz-scheduler:quartz:2.3.2'
2930

30-
implementation 'com.github.HenryFabio:configuration-injector:main-SNAPSHOT'
31-
implementation 'org.bstats:bstats-bukkit:1.8'
31+
implementation 'com.github.HenryFabio.configuration-injector:common:main-SNAPSHOT'
32+
implementation 'com.github.HenryFabio.configuration-injector:bukkit:main-SNAPSHOT'
3233

33-
pdm 'com.github.SaiintBrisson:command-framework:1.1.0'
34-
compile 'org.quartz-scheduler:quartz:2.3.2'
34+
pdm 'com.github.SaiintBrisson.command-framework:bukkit:1.2.0'
35+
pdm 'com.github.SaiintBrisson.command-framework:shared:1.2.0'
36+
37+
pdm 'org.bstats:bstats-bukkit:1.8'
3538

3639
def lombok = 'org.projectlombok:lombok:1.18.16'
3740
compileOnly lombok
@@ -47,7 +50,6 @@ bukkit {
4750
shadowJar {
4851
archiveName("${project.name}-${project.version}.jar")
4952
relocate 'com.henryfabio.minecraft.configinjector', 'com.nextplugins.tasks.libs.configinjector'
50-
relocate 'org.bstats', 'com.nextplugins.tasks.libs.bstats'
5153
}
5254

5355
compileJava {

src/main/java/com/nextplugins/tasks/NextTasks.java

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
package com.nextplugins.tasks;
22

3+
import com.google.common.base.Stopwatch;
34
import com.nextplugins.tasks.command.registry.CommandRegistry;
45
import com.nextplugins.tasks.configuration.registry.ConfigurationRegistry;
56
import com.nextplugins.tasks.job.JobLoader;
67
import com.nextplugins.tasks.manager.TaskManager;
78
import com.nextplugins.tasks.metric.MetricsProvider;
89
import com.nextplugins.tasks.parser.TimeExpressionParser;
910
import lombok.Getter;
11+
import lombok.val;
1012
import me.bristermitten.pdm.PluginDependencyManager;
1113
import org.bukkit.Bukkit;
1214
import org.bukkit.plugin.java.JavaPlugin;
1315

16+
import java.util.logging.Level;
17+
1418
public final class NextTasks extends JavaPlugin {
1519

16-
@Getter private final TaskManager taskManager = new TaskManager();
20+
@Getter
21+
private final TaskManager taskManager = new TaskManager();
1722
private final JobLoader jobLoader = new JobLoader(taskManager);
1823

1924
public static NextTasks getInstance() {
@@ -23,27 +28,51 @@ public static NextTasks getInstance() {
2328
@Override
2429
public void onEnable() {
2530
saveDefaultConfig();
26-
PluginDependencyManager.of(this).loadAllDependencies().thenRun(() -> {
27-
try {
28-
ConfigurationRegistry.of(this).register();
31+
getLogger().info("Baixando e carregando dependências necessárias...");
32+
33+
val downloadTime = Stopwatch.createStarted();
34+
35+
PluginDependencyManager.of(this)
36+
.loadAllDependencies()
37+
.exceptionally(throwable -> {
38+
39+
throwable.printStackTrace();
2940

30-
taskManager.loadTasks();
41+
getLogger().severe("Ocorreu um erro durante a inicialização do plugin!");
42+
Bukkit.getPluginManager().disablePlugin(this);
3143

32-
new TimeExpressionParser(taskManager).parse();
44+
return null;
3345

34-
jobLoader.executeAllJobs();
46+
})
47+
.join();
48+
49+
downloadTime.stop();
50+
51+
getLogger().log(Level.INFO, "Dependências carregadas com sucesso! ({0})", downloadTime);
52+
getLogger().info("Iniciando carregamento do plugin.");
53+
54+
val loadTime = Stopwatch.createStarted();
55+
try {
56+
ConfigurationRegistry.of(this).register();
3557

36-
CommandRegistry.of(this).register();
58+
taskManager.loadTasks();
3759

38-
MetricsProvider.of(this).configure();
60+
new TimeExpressionParser(taskManager).parse();
3961

40-
getLogger().info("Plugin inicializado com sucesso.");
41-
} catch (Throwable t) {
42-
t.printStackTrace();
43-
getLogger().severe("Ocorreu um erro durante a inicialização do plugin!");
44-
Bukkit.getPluginManager().disablePlugin(this);
45-
}
46-
});
62+
jobLoader.executeAllJobs();
63+
64+
CommandRegistry.of(this).register();
65+
66+
MetricsProvider.of(this).configure();
67+
68+
loadTime.stop();
69+
getLogger().log(Level.INFO, "Plugin inicializado com sucesso. ({0})", loadTime);
70+
71+
} catch (Throwable t) {
72+
t.printStackTrace();
73+
getLogger().severe("Ocorreu um erro durante a inicialização do plugin!");
74+
Bukkit.getPluginManager().disablePlugin(this);
75+
}
4776
}
4877

4978
@Override

0 commit comments

Comments
 (0)