Skip to content

Commit e80092f

Browse files
authored
Merge pull request #4 from Boougouh/main
Optimize Target Reset
2 parents ed88280 + d268e30 commit e80092f

File tree

21 files changed

+122
-161
lines changed

21 files changed

+122
-161
lines changed

build.gradle

Lines changed: 0 additions & 52 deletions
This file was deleted.

build.gradle.kts

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
3+
plugins {
4+
java
5+
id("com.github.johnrengelman.shadow") version "7.1.0"
6+
}
7+
8+
group = "me.bloodyhan"
9+
version = "5.0.1"
10+
11+
repositories {
12+
mavenCentral()
13+
maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
14+
maven("https://oss.sonatype.org/content/groups/public/")
15+
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
16+
}
17+
18+
dependencies {
19+
compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
20+
implementation("com.zaxxer:HikariCP:4.0.3")
21+
compileOnly("org.projectlombok:lombok:1.18.22")
22+
compileOnly("me.clip:placeholderapi:2.10.10")
23+
24+
annotationProcessor("org.projectlombok:lombok:1.18.22")
25+
testCompileOnly("org.projectlombok:lombok:1.18.22")
26+
testAnnotationProcessor("org.projectlombok:lombok:1.18.22")
27+
}
28+
29+
tasks {
30+
31+
withType<JavaCompile> {
32+
options.encoding = "UTF-8"
33+
}
34+
35+
val fatJar by named("shadowJar", ShadowJar::class) {
36+
archiveFileName.set("${project.name}-${project.version}.jar")
37+
38+
dependencies {
39+
exclude(dependency("org.slf4j:.*"))
40+
}
41+
42+
relocate("com.zaxxer", "me.bloodyhan.libs.com.zaxxer")
43+
minimize()
44+
}
45+
46+
artifacts {
47+
add("archives", fatJar)
48+
}
49+
50+
processResources {
51+
inputs.property("version", project.version)
52+
filesMatching("plugin.yml") {
53+
expand("version" to project.version)
54+
}
55+
}
56+
57+
build {
58+
dependsOn(shadowJar)
59+
}
60+
61+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

settings.gradle

Lines changed: 0 additions & 1 deletion
This file was deleted.

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = "BridgeLeveling"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.bukkit.ChatColor;
2020
import org.bukkit.entity.Player;
2121
import org.bukkit.plugin.java.JavaPlugin;
22-
import org.bukkit.scheduler.BukkitTask;
2322

2423
/**
2524
* @author Bloody_Han

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,17 @@
1414
import me.bloodyhan.bridgeleveling.database.SqlValue;
1515
import me.bloodyhan.bridgeleveling.database.Value;
1616
import me.bloodyhan.bridgeleveling.database.ValueType;
17-
import me.bloodyhan.bridgeleveling.task.BridgeTask;
1817
import me.bloodyhan.bridgeleveling.util.Method;
1918
import me.clip.placeholderapi.PlaceholderAPI;
2019
import org.bukkit.Bukkit;
2120
import org.bukkit.Location;
2221
import org.bukkit.Sound;
2322
import org.bukkit.entity.Player;
2423

25-
import java.util.*;
24+
import java.util.Collections;
25+
import java.util.HashMap;
26+
import java.util.List;
27+
import java.util.UUID;
2628

2729
/**
2830
* @author Bloody_Han
@@ -40,9 +42,7 @@ public class PlayerData {
4042
private int levelUpCost;
4143
private int killStreak = 0;
4244
private int blockPlace = 0;
43-
private Player lastDamager = null;
4445
private Rank rank = null;
45-
private BridgeTask task;
4646
private static HashMap<UUID, PlayerData> dataMap = Maps.newHashMap();
4747

4848
public PlayerData(@NonNull UUID uuid){

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public PlayerKillEvent(Player player, Player killer) {
2222

2323
@Override
2424
public HandlerList getHandlers() {
25-
return handlers;
26-
}
25+
return handlers;
26+
}
2727

2828
public static HandlerList getHandlerList() {
2929
return handlers;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package me.bloodyhan.bridgeleveling.api;
22

3-
import lombok.AccessLevel;
43
import lombok.Getter;
54

65
/**

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

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

33
import me.bloodyhan.bridgeleveling.Main;
44
import me.bloodyhan.bridgeleveling.api.PlayerData;
5-
import me.bloodyhan.bridgeleveling.config.MainConfig;
65
import me.bloodyhan.bridgeleveling.config.MessageConfig;
76
import me.bloodyhan.bridgeleveling.util.Method;
87
import me.clip.placeholderapi.PlaceholderAPI;

0 commit comments

Comments
 (0)