Skip to content

Commit e157b83

Browse files
committed
add support for papi (placeholders serverwide, not playerwide)
1 parent 122c217 commit e157b83

File tree

5 files changed

+29
-12
lines changed

5 files changed

+29
-12
lines changed

pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>fr</groupId>
88
<artifactId>AutoCommands_ACMD</artifactId>
9-
<version>1.0.6</version>
9+
<version>1.5.3</version>
1010
<packaging>jar</packaging>
1111

1212
<repositories>
@@ -45,9 +45,6 @@
4545
</dependency>
4646
</dependencies>
4747

48-
49-
50-
5148
<properties>
5249
<java.version>1.8</java.version>
5350
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/fr/lumi/Main.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,22 @@
1818
import java.util.ArrayList;
1919
import java.util.List;
2020
import java.util.Objects;
21+
import java.util.logging.Level;
2122

2223
public final class Main extends JavaPlugin {
2324

2425
private String[] Logo ={
2526
"&e&9 &6__ __ &e ",
26-
"&e&9 /\\ &6/ |\\/|| \\&e| &9Auto&6Commands &aVersion &e1.5.2",
27+
"&e&9 /\\ &6/ |\\/|| \\&e| &9Auto&6Commands &aVersion &e1.5.3",
2728
"&e&9/--\\&6\\__| ||__/&e| &8running on bukkit - paper",
2829
""};
2930

31+
boolean papiPresent = false;
32+
33+
public boolean isPapiPresent() {
34+
return papiPresent;
35+
}
36+
3037
FileConfiguration config = getConfig();
3138

3239
// TODO: implement condition system
@@ -122,6 +129,13 @@ public void init(){
122129
@Override
123130
public void onEnable() {
124131

132+
if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
133+
papiPresent = true;
134+
Bukkit.getConsoleSender().sendMessage(ChatColor.translateAlternateColorCodes('&',config.getString("ConsolePrefix")+" &aPlaceholderAPI found"));
135+
} else {
136+
Bukkit.getConsoleSender().sendMessage(ChatColor.translateAlternateColorCodes('&',config.getString("ConsolePrefix")+" &cPlaceholderAPI not found"));
137+
}
138+
125139
// add bstat metrics
126140
addBstatsMetrics();
127141

src/main/java/fr/lumi/Util/Utilities.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public Utilities(Main plg){
1313
plugin = plg;
1414
}
1515

16-
public String replacePlaceHolders(String s,autocommand cmd ){
16+
public String replacePlaceHolders(String s,autocommand cmd){
1717

1818
s = s.replace("%acmdName",cmd.getName());
1919

@@ -60,7 +60,7 @@ else if(cmd.getCycleInSec() == 0){
6060
s = s.replace("%acmdcurrentlyRunning",plugin.getRunningCommand()+"");
6161
s = s.replace("%acmdCurrentlyEnabled",plugin.getEnbaledCommand()+"");
6262

63-
s = PlaceholderAPI.setPlaceholders(null,s);
63+
s = PapiReplace(null,s);
6464

6565
return s;
6666
}
@@ -69,6 +69,8 @@ public String replacePlaceHoldersPluginVars(String s) {
6969
s = s.replace("%acmdFound",plugin.getcommandList().size()+"");
7070
s = s.replace("%acmdcurrentlyRunning",plugin.getRunningCommand()+"");
7171
s = s.replace("%acmdCurrentlyEnabled",plugin.getEnbaledCommand()+"");
72+
73+
s = PapiReplace(null,s);
7274
return s;
7375
}
7476

@@ -77,7 +79,7 @@ public String replacePlaceHoldersPluginVars(String s) {
7779
public String replacePlaceHoldersForPlayer(String s, autocommand cmd, Player player){
7880
s = replacePlaceHolders(s,cmd);
7981

80-
s = PlaceholderAPI.setPlaceholders(player,s);
82+
s = PapiReplace(player,s);
8183
return ChatColor.translateAlternateColorCodes('&',plugin.getConfig().getString("Prefix")+s);
8284
}
8385

@@ -97,6 +99,11 @@ public String replacePlaceHoldersForConsolePlgVar(String s){
9799
return ChatColor.translateAlternateColorCodes('&',plugin.getConfig().getString("ConsolePrefix")+s);
98100
}
99101

102+
public String PapiReplace( Player player, String s){
103+
if (plugin.isPapiPresent())
104+
s = PlaceholderAPI.setPlaceholders(player,s);
105+
return s;
106+
}
100107

101108

102109
}

src/main/java/fr/lumi/Util/autocommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import fr.lumi.ConditionsFolder.Condition;
44
import fr.lumi.Main;
5+
import me.clip.placeholderapi.PlaceholderAPI;
56
import org.bukkit.Bukkit;
67
import org.bukkit.ChatColor;
78
import org.bukkit.command.CommandSender;
89
import org.bukkit.configuration.file.FileConfiguration;
910
import org.bukkit.entity.Player;
10-
1111
import java.io.IOException;
1212
import java.util.ArrayList;
1313
import java.util.List;
@@ -177,7 +177,7 @@ public void run() {
177177

178178

179179
for(String command : m_commands ){
180-
String cmd = plugin.getUt().replacePlaceHoldersForConsole(command,this);
180+
String cmd = plugin.getUt().replacePlaceHolders(command,this);
181181
Bukkit.getConsoleSender().sendMessage(cmd);
182182
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),cmd);
183183
}

src/main/resources/plugin.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
name: AutoCommands
2-
version: 1.5.2
2+
version: 1.5.3
33
main: fr.lumi.Main
44
api-version: 1.15
55
authors:
66
- Lumi_
77
- Adi_
88
prefix: AutoCommands 1.2.0
9-
load: STARTUP
109
loadbefore:
1110
- PlaceholderAPI
1211
- essentials

0 commit comments

Comments
 (0)