Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 843ed12

Browse files
committed
Added PlaceholderAPI Placeholder integration
1 parent df9c256 commit 843ed12

File tree

11 files changed

+75
-19
lines changed

11 files changed

+75
-19
lines changed

.idea/jarRepositories.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__me_clip_placeholderapi_2_10_6.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_spigotmc_spigot_api_1_8_8_R0_1_SNAPSHOT.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CommandMessages.iml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
3333
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
3434
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.8-SNAPSHOT" level="project" />
35+
<orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.6" level="project" />
3536
</component>
3637
</module>

pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
<id>sonatype</id>
6363
<url>https://oss.sonatype.org/content/groups/public/</url>
6464
</repository>
65+
<repository>
66+
<id>minebench-repo</id>
67+
<url>https://repo.minebench.de/</url>
68+
</repository>
6569
</repositories>
6670

6771
<dependencies>
@@ -71,5 +75,11 @@
7175
<version>1.8.8-R0.1-SNAPSHOT</version>
7276
<scope>provided</scope>
7377
</dependency>
78+
<dependency>
79+
<groupId>me.clip</groupId>
80+
<artifactId>placeholderapi</artifactId>
81+
<version>2.10.6</version>
82+
<scope>provided</scope>
83+
</dependency>
7484
</dependencies>
7585
</project>

src/main/java/me/fullpage/commandmessages/CommandMessages.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package me.fullpage.commandmessages;
22

33
import me.fullpage.commandmessages.data.ConfigManager;
4+
import me.fullpage.commandmessages.hooks.PlaceholderAPIHook;
45
import me.fullpage.commandmessages.listeners.EventWaiter;
56
import org.bukkit.plugin.java.JavaPlugin;
67

8+
import java.util.logging.Level;
9+
710
public final class CommandMessages extends JavaPlugin {
811

912
private static CommandMessages instance;
@@ -19,10 +22,9 @@ public void onEnable() {
1922
new ConfigManager("config.yml").saveDefaultConfig();
2023
new EventWaiter(this);
2124

22-
}
25+
if (new PlaceholderAPIHook().getPlaceholderAPI())
26+
getLogger().log(Level.INFO, "Successfully hooked into PlaceholderAPI");
2327

24-
@Override
25-
public void onDisable() {
26-
// Plugin shutdown logic
2728
}
29+
2830
}
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
package me.fullpage.commandmessages.data;
22

3-
import org.bukkit.configuration.file.FileConfiguration;
4-
53
public class Config {
64

75
private static final ConfigManager configManager = new ConfigManager("config.yml");
8-
private static FileConfiguration config = configManager.getConfig();
96

107
public static ConfigManager getConfigManager() {
118
return configManager;
129
}
1310

14-
15-
1611
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package me.fullpage.commandmessages.hooks;
2+
3+
import me.clip.placeholderapi.PlaceholderAPI;
4+
import me.clip.placeholderapi.PlaceholderAPIPlugin;
5+
import org.bukkit.entity.Player;
6+
import org.bukkit.plugin.java.JavaPlugin;
7+
8+
public class PlaceholderAPIHook {
9+
10+
public boolean getPlaceholderAPI() {
11+
PlaceholderAPIPlugin placeholderAPI;
12+
try {
13+
placeholderAPI = JavaPlugin.getPlugin(PlaceholderAPIPlugin.class);
14+
} catch (Exception e) {
15+
return false;
16+
}
17+
return placeholderAPI != null;
18+
}
19+
20+
public String setPlaceholders(Player player, String str) {
21+
if (getPlaceholderAPI())
22+
return PlaceholderAPI.setPlaceholders(player, str);
23+
else return str;
24+
}
25+
26+
}

src/main/java/me/fullpage/commandmessages/listeners/EventWaiter.java

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

33
import me.fullpage.commandmessages.CommandMessages;
44
import me.fullpage.commandmessages.data.Config;
5+
import me.fullpage.commandmessages.hooks.PlaceholderAPIHook;
56
import org.bukkit.ChatColor;
67
import org.bukkit.configuration.file.FileConfiguration;
78
import org.bukkit.entity.Player;
@@ -38,20 +39,15 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
3839

3940
List<String> message = config.getStringList(key + ".message");
4041
for (String msg : message) {
42+
if (new PlaceholderAPIHook().getPlaceholderAPI())
43+
msg = new PlaceholderAPIHook().setPlaceholders(player, msg);
4144
player.sendMessage(ChatColor.translateAlternateColorCodes('&', msg));
4245
}
4346

4447

45-
46-
47-
48-
4948
}
5049

5150

52-
53-
54-
5551
}
5652

5753
}

0 commit comments

Comments
 (0)