Skip to content

Commit b05c308

Browse files
lumi-gitlumi-git
authored
Merge pull request #6 from lumi-git/v1.5.3
V1.5.3
2 parents f5948ff + e157b83 commit b05c308

File tree

7 files changed

+64
-26
lines changed

7 files changed

+64
-26
lines changed

‎pom.xml

Lines changed: 11 additions & 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>
@@ -18,6 +18,10 @@
1818
<id>sonatype</id>
1919
<url>https://oss.sonatype.org/content/groups/public/</url>
2020
</repository>
21+
<repository>
22+
<id>placeholderapi</id>
23+
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
24+
</repository>
2125
</repositories>
2226

2327
<dependencies>
@@ -33,11 +37,14 @@
3337
<version>3.0.2</version>
3438
<scope>compile</scope>
3539
</dependency>
40+
<dependency>
41+
<groupId>me.clip</groupId>
42+
<artifactId>placeholderapi</artifactId>
43+
<version>2.11.5</version>
44+
<scope>provided</scope>
45+
</dependency>
3646
</dependencies>
3747

38-
39-
40-
4148
<properties>
4249
<java.version>1.8</java.version>
4350
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎src/main/java/fr/lumi/Commandes/CommandRunnerCommand.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,14 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
169169
acmd.setRunning(true, plugin.getCommandsConfig(), plugin);
170170

171171

172-
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onRunAcmd"), acmd));
172+
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onRunAcmd"),acmd, (Player)player));
173173
}
174174

175175
if (Objects.equals(args[0], "stop")) {
176176

177177
acmd.setRunning(false, plugin.getCommandsConfig(), plugin);
178178

179-
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onStopAcmd"), acmd));
179+
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onStopAcmd"), acmd, (Player)player));
180180
//player.sendMessage(plugin.getConfig().getString("Prefix")+" please reload the plugin with /acmdreload to make this change effective");
181181
}
182182
if (Objects.equals(args[0], "enable")) {
@@ -185,15 +185,15 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
185185
//acmd.printToPlayer(sender);
186186
acmd.setActive(true);
187187

188-
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onEnablAcmd"), acmd));
188+
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onEnablAcmd"), acmd, (Player)player));
189189
}
190190

191191
if (Objects.equals(args[0], "disable")) {
192192

193193

194194
acmd.setRunning(false, plugin.getCommandsConfig(), plugin);
195195
acmd.setActive(false);
196-
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onDisableAcmd"), acmd));
196+
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onDisableAcmd"), acmd, (Player)player));
197197
//player.sendMessage(plugin.getConfig().getString("Prefix")+" please reload the plugin with /acmdreload to make this change effective");
198198
}
199199

@@ -205,7 +205,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
205205

206206
if(Objects.equals(args[0], "force")){
207207
acmd.runTest();
208-
sender.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer("&6 Force running %acmdName ", acmd));
208+
sender.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer("&6 Force running %acmdName ", acmd, (Player)player));
209209
}
210210

211211

@@ -277,7 +277,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
277277

278278
acmd.saveInConfig(plugin.getCommandsConfig(), plugin);
279279

280-
sender.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("CommandEdited"), acmd));
280+
sender.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("CommandEdited"), acmd, (Player)player));
281281
}
282282
}
283283

@@ -296,7 +296,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
296296

297297
acmd.delete(plugin.getCommandsConfig());
298298

299-
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onDeleteAcmd"), acmd));
299+
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onDeleteAcmd"), acmd, (Player)player));
300300

301301

302302
}
@@ -318,7 +318,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
318318

319319
cmd.setCycle(cycle);
320320
if (cmd.getCycle() < 200) {
321-
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("AlertShortCycle"), cmd));
321+
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("AlertShortCycle"), cmd, (Player)player));
322322

323323
}
324324

@@ -346,7 +346,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
346346
cmd.setID("acmd" +index);
347347
index++;
348348
}
349-
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onAddingANewCommand"), cmd));
349+
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onAddingANewCommand"), cmd, (Player)player));
350350
cmd.saveInConfig(plugin.getCommandsConfig(), plugin);//sauvegarde de la commande dans le fichier de commands
351351
cmd.setRunning(cmd.isRunning(), plugin.getCommandsConfig(), plugin);
352352
plugin.getcommandList().add(cmd);

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

Lines changed: 16 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
@@ -80,6 +87,7 @@ public File getLangFile() {
8087
public void addBstatsMetrics(){
8188
int pluginId = 21737;
8289
Metrics metrics = new Metrics(this, pluginId);
90+
metrics.addCustomChart(new Metrics.SimplePie("enabled_commands", () -> String.valueOf(getEnbaledCommand())));
8391
}
8492

8593

@@ -121,6 +129,13 @@ public void init(){
121129
@Override
122130
public void onEnable() {
123131

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+
124139
// add bstat metrics
125140
addBstatsMetrics();
126141

‎src/main/java/fr/lumi/Util/CommandEditor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ else if(slot == 53){//create a new acmd
9696
createEditGui();
9797
reloadGUI_ChoosingACMD();
9898
openchoosing(p);
99-
p.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onAddingANewCommand"), acmd));
99+
p.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onAddingANewCommand"), acmd, p));
100100
}
101101
}
102102
//menu edit
@@ -116,7 +116,7 @@ else if(slot == 53){//create a new acmd
116116

117117
p.closeInventory();
118118

119-
p.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onDeleteAcmd"), acmd));
119+
p.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onDeleteAcmd"), acmd, p));
120120
createEditGui();
121121
reloadGUI_ChoosingACMD();
122122
openchoosing(p);

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

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

33
import fr.lumi.Main;
44
import org.bukkit.ChatColor;
5+
import me.clip.placeholderapi.PlaceholderAPI;
6+
import org.bukkit.entity.Player;
57

68
public class Utilities {
79

@@ -11,7 +13,7 @@ public Utilities(Main plg){
1113
plugin = plg;
1214
}
1315

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

1618
s = s.replace("%acmdName",cmd.getName());
1719

@@ -58,6 +60,7 @@ else if(cmd.getCycleInSec() == 0){
5860
s = s.replace("%acmdcurrentlyRunning",plugin.getRunningCommand()+"");
5961
s = s.replace("%acmdCurrentlyEnabled",plugin.getEnbaledCommand()+"");
6062

63+
s = PapiReplace(null,s);
6164

6265
return s;
6366
}
@@ -66,13 +69,17 @@ public String replacePlaceHoldersPluginVars(String s) {
6669
s = s.replace("%acmdFound",plugin.getcommandList().size()+"");
6770
s = s.replace("%acmdcurrentlyRunning",plugin.getRunningCommand()+"");
6871
s = s.replace("%acmdCurrentlyEnabled",plugin.getEnbaledCommand()+"");
72+
73+
s = PapiReplace(null,s);
6974
return s;
7075
}
7176

7277

7378

74-
public String replacePlaceHoldersForPlayer(String s,autocommand cmd){
79+
public String replacePlaceHoldersForPlayer(String s, autocommand cmd, Player player){
7580
s = replacePlaceHolders(s,cmd);
81+
82+
s = PapiReplace(player,s);
7683
return ChatColor.translateAlternateColorCodes('&',plugin.getConfig().getString("Prefix")+s);
7784
}
7885

@@ -92,6 +99,11 @@ public String replacePlaceHoldersForConsolePlgVar(String s){
9299
return ChatColor.translateAlternateColorCodes('&',plugin.getConfig().getString("ConsolePrefix")+s);
93100
}
94101

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

96108

97109
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +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;
9-
10+
import org.bukkit.entity.Player;
1011
import java.io.IOException;
1112
import java.util.ArrayList;
1213
import java.util.List;
@@ -176,8 +177,9 @@ public void run() {
176177

177178

178179
for(String command : m_commands ){
179-
Bukkit.getConsoleSender().sendMessage(command);
180-
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),command);
180+
String cmd = plugin.getUt().replacePlaceHolders(command,this);
181+
Bukkit.getConsoleSender().sendMessage(cmd);
182+
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),cmd);
181183
}
182184

183185

@@ -263,14 +265,14 @@ public boolean getInConfig(FileConfiguration config,Main plg,String id){
263265
public void printToPlayer(CommandSender player){
264266

265267
for(String line : plugin.getLangConfig().getStringList("onDysplayingAcmd")){
266-
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(line,this));
268+
player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(line,this, (Player)player));
267269

268270
}
269271
}
270272

271273
public void printToConsole(){
272274
for(String line : plugin.getLangConfig().getStringList("onDysplayingAcmd")){
273-
Bukkit.getConsoleSender().sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(line,this));
275+
Bukkit.getConsoleSender().sendMessage(plugin.getUt().replacePlaceHoldersForConsole(line,this));
274276

275277
}
276278
}

‎src/main/resources/plugin.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
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
10-
9+
loadbefore:
10+
- PlaceholderAPI
11+
- essentials
12+
softdepend: [PlaceholderAPI]
1113
permissions:
1214
acmd.*:
1315
description: give acces to all the plugin

0 commit comments

Comments
 (0)