Skip to content

Commit 7ba2bc9

Browse files
committed
Merge branch 'dev' into commands-refactoring
# Conflicts: # src/main/java/dev/lotus/studio/Main.java # src/main/java/dev/lotus/studio/command/SafeZoneCommand.java
2 parents 73b8e66 + 9ba490e commit 7ba2bc9

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ dependencies {
3131
compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
3232
compileOnly 'io.th0rgal:oraxen:1.184.1'
3333
compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.2.15")
34-
implementation("com.google.guava:guava:10.0.1")
34+
implementation('com.google.guava:guava:32.0.1-android')
3535
implementation("org.xerial:sqlite-jdbc:3.50.3.0")
3636
implementation("com.j256.ormlite:ormlite-jdbc:6.1")
37+
implementation 'org.bstats:bstats-bukkit:3.0.0'
3738
}
3839

3940
java {

src/main/java/dev/lotus/studio/Main.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import dev.lotus.studio.database.DatabaseInitializer;
44
import dev.lotus.studio.database.playerdata.PlayerDataService;
5-
import dev.lotus.studio.safezone.SafeZonePreloaded;
5+
import org.bstats.bukkit.Metrics;
66
import org.bukkit.event.HandlerList;
77
import org.bukkit.plugin.java.JavaPlugin;
88
import dev.lotus.studio.database.savezone.SafeZoneDataService;
@@ -29,6 +29,7 @@ public final class Main extends JavaPlugin {
2929

3030
@Override
3131
public void onEnable() {
32+
metric();
3233
if (initialize()){
3334
getLogger().log(Level.INFO, "Plugin has been enabled!");
3435
}
@@ -79,6 +80,12 @@ public void onDisable() {
7980
getLogger().info("LotusOffSeason plugin disabled!");
8081
HandlerList.unregisterAll(this);
8182
}
83+
private void metric(){
84+
int pluginId = 27359;
85+
Metrics metrics = new Metrics(this, pluginId);
86+
}
87+
88+
8289
public PlayerDataService getPlayerDataBase() {
8390
return playerDataBase;
8491
}

src/main/java/dev/lotus/studio/command/SafeZoneCommand.java

Whitespace-only changes.

src/main/resources/plugin.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ soft-depend: [Oraxen]
66
libraries:
77
- org.xerial:sqlite-jdbc:3.50.3.0
88
- com.j256.ormlite:ormlite-jdbc:6.1
9-
- com.google.guava:guava:10.0.1
9+
- com.google.guava:guava:32.0.1-android
10+
- org.bstats:bstats-bukkit:3.0.0
1011
commands:
1112
lotus:
1213
description: Перезагрузка конфигурации плагина.

0 commit comments

Comments
 (0)