Skip to content

Commit 41e3364

Browse files
committed
feat: REMOVE PDM OOoOoooOo
1 parent 261ee00 commit 41e3364

5 files changed

Lines changed: 871 additions & 59 deletions

File tree

build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
id 'java'
33

4-
id 'me.bristermitten.pdm' version '0.0.30'
54
id 'com.github.johnrengelman.shadow' version '5.0.0'
65

76
id 'net.minecrell.plugin-yml.bukkit' version '0.3.0'
@@ -10,11 +9,10 @@ plugins {
109
group 'com.nextplugins'
1110
version '1.0.1'
1211

13-
tasks.build.dependsOn('pdm', 'shadowJar')
12+
tasks.build.dependsOn('shadowJar')
1413

1514
repositories {
1615
mavenCentral()
17-
jcenter()
1816

1917
maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
2018
maven { url = 'https://oss.sonatype.org/content/groups/public/' }
@@ -26,15 +24,10 @@ repositories {
2624

2725
dependencies {
2826
compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT'
29-
compile 'org.quartz-scheduler:quartz:2.3.2'
3027

31-
implementation 'com.github.HenryFabio.configuration-injector:common:main-SNAPSHOT'
28+
implementation 'org.quartz-scheduler:quartz:2.3.2'
3229
implementation 'com.github.HenryFabio.configuration-injector:bukkit:main-SNAPSHOT'
33-
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'
30+
implementation 'com.github.SaiintBrisson.command-framework:bukkit:1.2.0'
3831

3932
def lombok = 'org.projectlombok:lombok:1.18.16'
4033
compileOnly lombok
@@ -50,6 +43,10 @@ bukkit {
5043
shadowJar {
5144
archiveName("${project.name}-${project.version}.jar")
5245
relocate 'com.henryfabio.minecraft.configinjector', 'com.nextplugins.tasks.libs.configinjector'
46+
relocate 'me.saiintbrisson.minecraft.command', 'com.nextplugins.tasks.libs.command.common'
47+
relocate 'me.saiintbrisson.bukkit.command', 'com.nextplugins.tasks.libs.command.bukkit'
48+
relocate 'com.mchange', 'com.nextplugins.tasks.libs.quartz'
49+
relocate 'com.zaxxer.hikari', 'com.nextplugins.tasks.libs.hikari'
5350
}
5451

5552
compileJava {

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

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
import com.nextplugins.tasks.configuration.registry.ConfigurationRegistry;
66
import com.nextplugins.tasks.job.JobLoader;
77
import com.nextplugins.tasks.manager.TaskManager;
8-
import com.nextplugins.tasks.metric.MetricsProvider;
8+
import com.nextplugins.tasks.api.metric.MetricProvider;
99
import com.nextplugins.tasks.parser.TimeExpressionParser;
1010
import lombok.Getter;
1111
import lombok.val;
12-
import me.bristermitten.pdm.PluginDependencyManager;
1312
import org.bukkit.Bukkit;
1413
import org.bukkit.plugin.java.JavaPlugin;
1514

@@ -28,27 +27,6 @@ public static NextTasks getInstance() {
2827
@Override
2928
public void onEnable() {
3029
saveDefaultConfig();
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();
40-
41-
getLogger().severe("Ocorreu um erro durante a inicialização do plugin!");
42-
Bukkit.getPluginManager().disablePlugin(this);
43-
44-
return null;
45-
46-
})
47-
.join();
48-
49-
downloadTime.stop();
50-
51-
getLogger().log(Level.INFO, "Dependências carregadas com sucesso! ({0})", downloadTime);
5230
getLogger().info("Iniciando carregamento do plugin.");
5331

5432
val loadTime = Stopwatch.createStarted();
@@ -62,8 +40,7 @@ public void onEnable() {
6240
jobLoader.executeAllJobs();
6341

6442
CommandRegistry.of(this).register();
65-
66-
MetricsProvider.of(this).configure();
43+
MetricProvider.of(this).register();
6744

6845
loadTime.stop();
6946
getLogger().log(Level.INFO, "Plugin inicializado com sucesso. ({0})", loadTime);
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.nextplugins.tasks.api.metric;
2+
3+
import lombok.Data;
4+
import org.bukkit.plugin.java.JavaPlugin;
5+
6+
@Data(staticConstructor = "of")
7+
public final class MetricProvider {
8+
9+
private final JavaPlugin plugin;
10+
11+
public void register() {
12+
13+
System.setProperty("bstats.relocatecheck", "false");
14+
15+
new MetricsConnector(plugin, 10041);
16+
plugin.getLogger().info("Métrica de uso habilitada com sucesso.");
17+
18+
}
19+
20+
}

0 commit comments

Comments
 (0)