Merge pull request #4 from Boougouh/main

Optimize Target Reset

build.gradle.kts

@@ -0,0 +1,61 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    java
+    id("com.github.johnrengelman.shadow") version "7.1.0"
+}
+
+group = "me.bloodyhan"
+version = "5.0.1"
+
+repositories {
+    mavenCentral()
+    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+    maven("https://oss.sonatype.org/content/groups/public/")
+    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+}
+
+dependencies {
+    compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
+    implementation("com.zaxxer:HikariCP:4.0.3")
+    compileOnly("org.projectlombok:lombok:1.18.22")
+    compileOnly("me.clip:placeholderapi:2.10.10")
+
+    annotationProcessor("org.projectlombok:lombok:1.18.22")
+    testCompileOnly("org.projectlombok:lombok:1.18.22")
+    testAnnotationProcessor("org.projectlombok:lombok:1.18.22")
+}
+
+tasks {
+
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+    }
+
+    val fatJar by named("shadowJar", ShadowJar::class) {
+        archiveFileName.set("${project.name}-${project.version}.jar")
+
+        dependencies {
+            exclude(dependency("org.slf4j:.*"))
+        }
+
+        relocate("com.zaxxer", "me.bloodyhan.libs.com.zaxxer")
+        minimize()
+    }
+
+    artifacts {
+        add("archives", fatJar)
+    }
+
+    processResources {
+        inputs.property("version", project.version)
+        filesMatching("plugin.yml") {
+            expand("version" to project.version)
+        }
+    }
+
+    build {
+        dependsOn(shadowJar)
+    }
+
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "BridgeLeveling"

src/main/java/me/bloodyhan/bridgeleveling/Main.java

@@ -19,7 +19,6 @@
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitTask;
 
 /**
  * @author Bloody_Han

src/main/java/me/bloodyhan/bridgeleveling/api/PlayerData.java

@@ -14,15 +14,17 @@
 import me.bloodyhan.bridgeleveling.database.SqlValue;
 import me.bloodyhan.bridgeleveling.database.Value;
 import me.bloodyhan.bridgeleveling.database.ValueType;
-import me.bloodyhan.bridgeleveling.task.BridgeTask;
 import me.bloodyhan.bridgeleveling.util.Method;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * @author Bloody_Han
@@ -40,9 +42,7 @@ public class PlayerData {
     private int levelUpCost;
     private int killStreak = 0;
     private int blockPlace = 0;
-    private Player lastDamager = null;
     private Rank rank = null;
-    private BridgeTask task;
     private static HashMap<UUID, PlayerData> dataMap = Maps.newHashMap();
 
     public PlayerData(@NonNull UUID uuid){

src/main/java/me/bloodyhan/bridgeleveling/api/PlayerKillEvent.java

@@ -22,8 +22,8 @@ public PlayerKillEvent(Player player, Player killer) {
 
     @Override
     public HandlerList getHandlers() {
-			return handlers;
-		}
+        return handlers;
+    }
 
 	public static HandlerList getHandlerList() {
 			return handlers;

src/main/java/me/bloodyhan/bridgeleveling/api/Rank.java

@@ -1,6 +1,5 @@
 package me.bloodyhan.bridgeleveling.api;
 
-import lombok.AccessLevel;
 import lombok.Getter;
 
 /**

src/main/java/me/bloodyhan/bridgeleveling/command/BridgeCommand.java

@@ -2,7 +2,6 @@
 
 import me.bloodyhan.bridgeleveling.Main;
 import me.bloodyhan.bridgeleveling.api.PlayerData;
-import me.bloodyhan.bridgeleveling.config.MainConfig;
 import me.bloodyhan.bridgeleveling.config.MessageConfig;
 import me.bloodyhan.bridgeleveling.util.Method;
 import me.clip.placeholderapi.PlaceholderAPI;

src/main/java/me/bloodyhan/bridgeleveling/command/CommandManager.java

@@ -14,12 +14,15 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * @author Bongle (Boougouh)
- * @createDate 2020/04/05
  * @version 2.1
+ * @createDate 2020/04/05
  */
 
 public class CommandManager extends BukkitCommand {
@@ -284,4 +287,4 @@ public enum CommandOnly{
 
     }
 
-}
+}

src/main/java/me/bloodyhan/bridgeleveling/config/ConfigManager.java

@@ -1,7 +1,6 @@
 package me.bloodyhan.bridgeleveling.config;
 
 import me.bloodyhan.bridgeleveling.Main;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.YamlConfiguration;
 

src/main/java/me/bloodyhan/bridgeleveling/config/SoundConfig.java

@@ -1,8 +1,5 @@
 package me.bloodyhan.bridgeleveling.config;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Sound;
-
 /**
  * @author Bloody_Han
  */

src/main/java/me/bloodyhan/bridgeleveling/database/MySQL.java

@@ -1,16 +1,12 @@
 package me.bloodyhan.bridgeleveling.database;
 
-import com.google.common.base.Joiner;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import me.bloodyhan.bridgeleveling.Main;
 import me.bloodyhan.bridgeleveling.config.MainConfig;
 
 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.stream.Collectors;
 
 /**
  * @author Bloody_Han

src/main/java/me/bloodyhan/bridgeleveling/database/SQLite.java

@@ -2,13 +2,10 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
 import me.bloodyhan.bridgeleveling.Main;
 import org.bukkit.Bukkit;
 
 import java.io.File;
-import java.io.IOException;
 import java.sql.*;
 import java.util.Arrays;
 import java.util.List;