Add PlaceholderAPI support#2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mdcfe wants to merge 14 commits into from
Closed

Add PlaceholderAPI support #2041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8262037
Adding the option to use PlaceholderAPI chat format internally
Banbeucmas Apr 1, 2018
d36d1e6
Update pom.xml
Banbeucmas Apr 1, 2018
87549f8
Switching method to FormatUtils
Banbeucmas Apr 1, 2018
3603d23
Only check whether PAPI is enabled first time
mdcfe Apr 3, 2018
9da486f
Add placeholderAPIFormat overload
mdcfe Apr 3, 2018
fe93124
Use PlaceholderAPI in quit message
Banbeucmas Apr 3, 2018
6b609f5
Use PlaceholderAPI in join message
Banbeucmas Apr 3, 2018
4de18a0
Include PAPI formatting in KeywordReplacer
mdcfe Apr 3, 2018
d93f413
Use PluginEvent to handle PlaceholderAPI load.
Banbeucmas Apr 7, 2018
9a4bc39
Why is it null?
Banbeucmas Apr 7, 2018
8acb007
Keep it null and adding null check for listener
Banbeucmas Apr 7, 2018
bf596ca
Format messages in User#sendMessage
md678685 Jun 14, 2018
3dc3f69
Implement FakePluginManager.isPluginEnabled
md678685 Jun 14, 2018
4a6437e
Fix quit message replacement
md678685 Jun 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.LocationUtil;
import net.ess3.api.IEssentials;
import net.ess3.nms.refl.ReflUtil;
Expand DownExpand Up@@ -152,7 +153,12 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
event.setQuitMessage(null);
} else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
final Player player = event.getPlayer();
event.setQuitMessage(ess.getSettings().getCustomQuitMessage().replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()));
String quitMessage = ess.getSettings().getCustomQuitMessage()
.replace("{PLAYER}", player.getDisplayName())
.replace("{USERNAME}", player.getName());
//Untested, should work tho
quitMessage = FormatUtil.placeholderAPIFormat(user, quitMessage);
event.setQuitMessage(quitMessage);
}

user.startTransaction();
Expand DownExpand Up@@ -256,9 +262,11 @@ public void run() {
} else if (message == null) {
//NOOP
} else if (ess.getSettings().isCustomJoinMessage()) {
//Untested, should work tho
String msg = ess.getSettings().getCustomJoinMessage()
.replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
.replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()));
msg = FormatUtil.placeholderAPIFormat(player, msg);
ess.getServer().broadcastMessage(msg);
} else if (ess.getSettings().allowSilentJoinQuit()) {
ess.getServer().broadcastMessage(message);
Expand Down
10 changes: 10 additions & 0 deletions Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
package com.earth2me.essentials;

import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand DownExpand Up@@ -29,6 +31,10 @@ public void onPluginEnable(final PluginEnableEvent event) {
if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) {
ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
}

if((FormatUtil.papiEnabled == null || !FormatUtil.papiEnabled) && event.getPlugin().getName().equals("PlaceholderAPI")) {
FormatUtil.papiEnabled = true;
}
}

@EventHandler(priority = EventPriority.MONITOR)
Expand All@@ -42,6 +48,10 @@ public void onPluginDisable(final PluginDisableEvent event) {
Methods.reset();
ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
}

if(FormatUtil.papiEnabled != null && FormatUtil.papiEnabled && event.getPlugin().getName().equals("PlaceholderAPI")){
FormatUtil.papiEnabled = false;
}
}

@Override
Expand Down
1 change: 1 addition & 0 deletions Essentials/src/com/earth2me/essentials/User.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -784,6 +784,7 @@ public void setRecipeSee(boolean recipeSee) {
@Override
public void sendMessage(String message) {
if (!message.isEmpty()) {
message = FormatUtil.placeholderAPIFormat(this, message);
base.sendMessage(message);
}
}
Expand Down
2 changes: 2 additions & 0 deletions Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Location;
Expand DownExpand Up@@ -74,6 +75,7 @@ private void replaceKeywords(final CommandSource sender) {

for (int i = 0; i < input.getLines().size(); i++) {
String line = input.getLines().get(i);
line = FormatUtil.placeholderAPIFormat(user, line);
final Matcher matcher = KEYWORD.matcher(line);

while (matcher.find()) {
Expand Down
28 changes: 28 additions & 0 deletions Essentials/src/com/earth2me/essentials/utils/FormatUtil.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
package com.earth2me.essentials.utils;

import me.clip.placeholderapi.PlaceholderAPI;
import net.ess3.api.IUser;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;

import java.util.regex.Pattern;

Expand All@@ -22,6 +25,9 @@ public class FormatUtil {
static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
public static final Pattern IPPATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");

//If we are going to make this static, should we move it?
public static Boolean papiEnabled = null;

//This method is used to simply strip the native minecraft colour codes
public static String stripFormat(final String input) {
if (input == null) {
Expand All@@ -38,6 +44,28 @@ public static String stripEssentialsFormat(final String input) {
return stripColor(input, REPLACE_ALL_PATTERN);
}

public static String placeholderAPIFormat(final IUser user, final String input) {
return placeholderAPIFormat(user.getBase(), input);
}

//Formatting PlaceholderAPI Placeholders, returns the original string if the plugin isn't enabled
//Seperate this from #getChatFormat() in ISettings due to the requirement of Player as an argument
public static String placeholderAPIFormat(final Player player, final String input) {
if (input == null) {
return null;
}

if (papiEnabled == null) {
papiEnabled = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
}

//Checking here instead, please tell me if there is a better way
if (papiEnabled) {
return PlaceholderAPI.setPlaceholders(player, input);
}
return input;
}

//This is the general permission sensitive message format function, checks for urls.
public static String formatMessage(final IUser user, final String permBase, final String input) {
if (input == null) {
Expand Down
2 changes: 1 addition & 1 deletion Essentials/src/plugin.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials
version: ${full.version}
website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally, drtshock, vemacs, SupaHam, md678685]
commands:
afk:
Expand Down
2 changes: 1 addition & 1 deletion Essentials/test/com/earth2me/essentials/FakeServer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ public Plugin[] getPlugins() {

@Override
public boolean isPluginEnabled(String name) {
throw new UnsupportedOperationException("Not supported yet.");
return name.equals("Essentials");
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand DownExpand Up@@ -57,6 +58,8 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
format = format.replace("{5}", team == null ? "" : team.getDisplayName());
format = format.replace("{6}", prefix);
format = format.replace("{7}", suffix);
format = FormatUtil.placeholderAPIFormat(user, format);

synchronized (format) {
event.setFormat(format);
}
Expand Down
2 changes: 1 addition & 1 deletion EssentialsChat/src/plugin.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,4 +7,4 @@ website: http://tiny.cc/EssentialsCommands
description: Provides chat control features for Essentials. Requires Permissions.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
depend: [Essentials]
#softdepend: [Factions]
softdepend: [PlaceholderAPI]
10 changes: 10 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,10 @@
<id>bukkit-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
</repositories>

<modules>
Expand DownExpand Up@@ -68,6 +72,12 @@
<version>1.12.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>LATEST</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add PlaceholderAPI support#2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mdcfe
wants to merge
14
commits into

from

 Closed


Add PlaceholderAPI support
#2041
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
8262037

Adding the option to use PlaceholderAPI chat format internally


Banbeucmas Apr 1, 2018
d36d1e6

Update pom.xml


Banbeucmas Apr 1, 2018
87549f8

Switching method to FormatUtils


Banbeucmas Apr 1, 2018
3603d23

Only check whether PAPI is enabled first time


mdcfe Apr 3, 2018
9da486f

Add placeholderAPIFormat overload


mdcfe Apr 3, 2018
fe93124

Use PlaceholderAPI in quit message


Banbeucmas Apr 3, 2018
6b609f5

Use PlaceholderAPI in join message


Banbeucmas Apr 3, 2018
4de18a0

Include PAPI formatting in KeywordReplacer


mdcfe Apr 3, 2018
d93f413

Use PluginEvent to handle PlaceholderAPI load.


Banbeucmas Apr 7, 2018
9a4bc39

Why is it null?


Banbeucmas Apr 7, 2018
8acb007

Keep it null and adding null check for listener


Banbeucmas Apr 7, 2018
bf596ca

Format messages in User#sendMessage


md678685 Jun 14, 2018
3dc3f69

Implement FakePluginManager.isPluginEnabled


md678685 Jun 14, 2018
4a6437e

Fix quit message replacement


md678685 Jun 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.LocationUtil;
import net.ess3.api.IEssentials;
import net.ess3.nms.refl.ReflUtil;
Expand DownExpand Up@@ -152,7 +153,12 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
 event.setQuitMessage(null);
 } else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
 final Player player = event.getPlayer();
 event.setQuitMessage(ess.getSettings().getCustomQuitMessage().replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()));
 String quitMessage = ess.getSettings().getCustomQuitMessage()
 .replace("{PLAYER}", player.getDisplayName())
 .replace("{USERNAME}", player.getName());
 //Untested, should work tho
 quitMessage = FormatUtil.placeholderAPIFormat(user, quitMessage);
 event.setQuitMessage(quitMessage);
 }

 user.startTransaction();
Expand DownExpand Up@@ -256,9 +262,11 @@ public void run() {
 } else if (message == null) {
 //NOOP
 } else if (ess.getSettings().isCustomJoinMessage()) {
 //Untested, should work tho
 String msg = ess.getSettings().getCustomJoinMessage()
 .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
 .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()));
 msg = FormatUtil.placeholderAPIFormat(player, msg);
 ess.getServer().broadcastMessage(msg);
 } else if (ess.getSettings().allowSilentJoinQuit()) {
 ess.getServer().broadcastMessage(message);
Expand Down

10 changes: 10 additions & 0 deletions
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
package com.earth2me.essentials;

import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand DownExpand Up@@ -29,6 +31,10 @@ public void onPluginEnable(final PluginEnableEvent event) {
 if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) {
 ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 }

 if((FormatUtil.papiEnabled == null || !FormatUtil.papiEnabled) && event.getPlugin().getName().equals("PlaceholderAPI")) {
 FormatUtil.papiEnabled = true;
 }
 }

 @EventHandler(priority = EventPriority.MONITOR)
Expand All@@ -42,6 +48,10 @@ public void onPluginDisable(final PluginDisableEvent event) {
 Methods.reset();
 ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
 }

 if(FormatUtil.papiEnabled != null && FormatUtil.papiEnabled && event.getPlugin().getName().equals("PlaceholderAPI")){
 FormatUtil.papiEnabled = false;
 }
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
Essentials/src/com/earth2me/essentials/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,6 +784,7 @@ public void setRecipeSee(boolean recipeSee) {
 @Override
 public void sendMessage(String message) {
 if (!message.isEmpty()) {
 message = FormatUtil.placeholderAPIFormat(this, message);
 base.sendMessage(message);
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Location;
Expand DownExpand Up@@ -74,6 +75,7 @@ private void replaceKeywords(final CommandSource sender) {

 for (int i = 0; i < input.getLines().size(); i++) {
 String line = input.getLines().get(i);
 line = FormatUtil.placeholderAPIFormat(user, line);
 final Matcher matcher = KEYWORD.matcher(line);

 while (matcher.find()) {
Expand Down

28 changes: 28 additions & 0 deletions
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
package com.earth2me.essentials.utils;

import me.clip.placeholderapi.PlaceholderAPI;
import net.ess3.api.IUser;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;

import java.util.regex.Pattern;

Expand All@@ -22,6 +25,9 @@ public class FormatUtil {
 static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
 public static final Pattern IPPATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");

 //If we are going to make this static, should we move it?
 public static Boolean papiEnabled = null;

 //This method is used to simply strip the native minecraft colour codes
 public static String stripFormat(final String input) {
 if (input == null) {
Expand All@@ -38,6 +44,28 @@ public static String stripEssentialsFormat(final String input) {
 return stripColor(input, REPLACE_ALL_PATTERN);
 }

 public static String placeholderAPIFormat(final IUser user, final String input) {
 return placeholderAPIFormat(user.getBase(), input);
 }

 //Formatting PlaceholderAPI Placeholders, returns the original string if the plugin isn't enabled
 //Seperate this from #getChatFormat() in ISettings due to the requirement of Player as an argument
 public static String placeholderAPIFormat(final Player player, final String input) {
 if (input == null) {
 return null;
 }

 if (papiEnabled == null) {
 papiEnabled = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
 }

 //Checking here instead, please tell me if there is a better way
 if (papiEnabled) {
 return PlaceholderAPI.setPlaceholders(player, input);
 }
 return input;
 }

 //This is the general permission sensitive message format function, checks for urls.
 public static String formatMessage(final IUser user, final String permBase, final String input) {
 if (input == null) {
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials
version: ${full.version}
website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally, drtshock, vemacs, SupaHam, md678685]
commands:
 afk:
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/test/com/earth2me/essentials/FakeServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ public Plugin[] getPlugins() {

 @Override
 public boolean isPluginEnabled(String name) {
throw new UnsupportedOperationException("Not supported yet.");
return name.equals("Essentials");
 }

 @Override
Expand Down

3 changes: 3 additions & 0 deletions
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand DownExpand Up@@ -57,6 +58,8 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
 format = format.replace("{5}", team == null ? "" : team.getDisplayName());
 format = format.replace("{6}", prefix);
 format = format.replace("{7}", suffix);
 format = FormatUtil.placeholderAPIFormat(user, format);

 synchronized (format) {
 event.setFormat(format);
 }
Expand Down

2 changes: 1 addition & 1 deletion
EssentialsChat/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,4 +7,4 @@ website: http://tiny.cc/EssentialsCommands
description: Provides chat control features for Essentials. Requires Permissions.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
depend: [Essentials]
#softdepend: [Factions]
softdepend: [PlaceholderAPI]

10 changes: 10 additions & 0 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,10 @@
 <id>bukkit-repo</id>
 <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 </repository>
 <repository>
 <id>placeholderapi</id>
 <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 </repository>
 </repositories>

 <modules>
Expand DownExpand Up@@ -68,6 +72,12 @@
 <version>1.12.2</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>me.clip</groupId>
 <artifactId>placeholderapi</artifactId>
 <version>LATEST</version>
 <scope>provided</scope>
 </dependency>
 </dependencies>

 <build>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add PlaceholderAPI support#2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mdcfe
wants to merge
14
commits into

from

 Closed


Add PlaceholderAPI support
#2041
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
8262037

Adding the option to use PlaceholderAPI chat format internally


Banbeucmas Apr 1, 2018
d36d1e6

Update pom.xml


Banbeucmas Apr 1, 2018
87549f8

Switching method to FormatUtils


Banbeucmas Apr 1, 2018
3603d23

Only check whether PAPI is enabled first time


mdcfe Apr 3, 2018
9da486f

Add placeholderAPIFormat overload


mdcfe Apr 3, 2018
fe93124

Use PlaceholderAPI in quit message


Banbeucmas Apr 3, 2018
6b609f5

Use PlaceholderAPI in join message


Banbeucmas Apr 3, 2018
4de18a0

Include PAPI formatting in KeywordReplacer


mdcfe Apr 3, 2018
d93f413

Use PluginEvent to handle PlaceholderAPI load.


Banbeucmas Apr 7, 2018
9a4bc39

Why is it null?


Banbeucmas Apr 7, 2018
8acb007

Keep it null and adding null check for listener


Banbeucmas Apr 7, 2018
bf596ca

Format messages in User#sendMessage


md678685 Jun 14, 2018
3dc3f69

Implement FakePluginManager.isPluginEnabled


md678685 Jun 14, 2018
4a6437e

Fix quit message replacement


md678685 Jun 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.LocationUtil;
import net.ess3.api.IEssentials;
import net.ess3.nms.refl.ReflUtil;
Expand DownExpand Up@@ -152,7 +153,12 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
 event.setQuitMessage(null);
 } else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
 final Player player = event.getPlayer();
 event.setQuitMessage(ess.getSettings().getCustomQuitMessage().replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()));
 String quitMessage = ess.getSettings().getCustomQuitMessage()
 .replace("{PLAYER}", player.getDisplayName())
 .replace("{USERNAME}", player.getName());
 //Untested, should work tho
 quitMessage = FormatUtil.placeholderAPIFormat(user, quitMessage);
 event.setQuitMessage(quitMessage);
 }

 user.startTransaction();
Expand DownExpand Up@@ -256,9 +262,11 @@ public void run() {
 } else if (message == null) {
 //NOOP
 } else if (ess.getSettings().isCustomJoinMessage()) {
 //Untested, should work tho
 String msg = ess.getSettings().getCustomJoinMessage()
 .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
 .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()));
 msg = FormatUtil.placeholderAPIFormat(player, msg);
 ess.getServer().broadcastMessage(msg);
 } else if (ess.getSettings().allowSilentJoinQuit()) {
 ess.getServer().broadcastMessage(message);
Expand Down

10 changes: 10 additions & 0 deletions
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
package com.earth2me.essentials;

import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand DownExpand Up@@ -29,6 +31,10 @@ public void onPluginEnable(final PluginEnableEvent event) {
 if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) {
 ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 }

 if((FormatUtil.papiEnabled == null || !FormatUtil.papiEnabled) && event.getPlugin().getName().equals("PlaceholderAPI")) {
 FormatUtil.papiEnabled = true;
 }
 }

 @EventHandler(priority = EventPriority.MONITOR)
Expand All@@ -42,6 +48,10 @@ public void onPluginDisable(final PluginDisableEvent event) {
 Methods.reset();
 ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
 }

 if(FormatUtil.papiEnabled != null && FormatUtil.papiEnabled && event.getPlugin().getName().equals("PlaceholderAPI")){
 FormatUtil.papiEnabled = false;
 }
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
Essentials/src/com/earth2me/essentials/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,6 +784,7 @@ public void setRecipeSee(boolean recipeSee) {
 @Override
 public void sendMessage(String message) {
 if (!message.isEmpty()) {
 message = FormatUtil.placeholderAPIFormat(this, message);
 base.sendMessage(message);
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Location;
Expand DownExpand Up@@ -74,6 +75,7 @@ private void replaceKeywords(final CommandSource sender) {

 for (int i = 0; i < input.getLines().size(); i++) {
 String line = input.getLines().get(i);
 line = FormatUtil.placeholderAPIFormat(user, line);
 final Matcher matcher = KEYWORD.matcher(line);

 while (matcher.find()) {
Expand Down

28 changes: 28 additions & 0 deletions
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
package com.earth2me.essentials.utils;

import me.clip.placeholderapi.PlaceholderAPI;
import net.ess3.api.IUser;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;

import java.util.regex.Pattern;

Expand All@@ -22,6 +25,9 @@ public class FormatUtil {
 static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
 public static final Pattern IPPATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");

 //If we are going to make this static, should we move it?
 public static Boolean papiEnabled = null;

 //This method is used to simply strip the native minecraft colour codes
 public static String stripFormat(final String input) {
 if (input == null) {
Expand All@@ -38,6 +44,28 @@ public static String stripEssentialsFormat(final String input) {
 return stripColor(input, REPLACE_ALL_PATTERN);
 }

 public static String placeholderAPIFormat(final IUser user, final String input) {
 return placeholderAPIFormat(user.getBase(), input);
 }

 //Formatting PlaceholderAPI Placeholders, returns the original string if the plugin isn't enabled
 //Seperate this from #getChatFormat() in ISettings due to the requirement of Player as an argument
 public static String placeholderAPIFormat(final Player player, final String input) {
 if (input == null) {
 return null;
 }

 if (papiEnabled == null) {
 papiEnabled = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
 }

 //Checking here instead, please tell me if there is a better way
 if (papiEnabled) {
 return PlaceholderAPI.setPlaceholders(player, input);
 }
 return input;
 }

 //This is the general permission sensitive message format function, checks for urls.
 public static String formatMessage(final IUser user, final String permBase, final String input) {
 if (input == null) {
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials
version: ${full.version}
website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally, drtshock, vemacs, SupaHam, md678685]
commands:
 afk:
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/test/com/earth2me/essentials/FakeServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ public Plugin[] getPlugins() {

 @Override
 public boolean isPluginEnabled(String name) {
throw new UnsupportedOperationException("Not supported yet.");
return name.equals("Essentials");
 }

 @Override
Expand Down

3 changes: 3 additions & 0 deletions
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand DownExpand Up@@ -57,6 +58,8 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
 format = format.replace("{5}", team == null ? "" : team.getDisplayName());
 format = format.replace("{6}", prefix);
 format = format.replace("{7}", suffix);
 format = FormatUtil.placeholderAPIFormat(user, format);

 synchronized (format) {
 event.setFormat(format);
 }
Expand Down

2 changes: 1 addition & 1 deletion
EssentialsChat/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,4 +7,4 @@ website: http://tiny.cc/EssentialsCommands
description: Provides chat control features for Essentials. Requires Permissions.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
depend: [Essentials]
#softdepend: [Factions]
softdepend: [PlaceholderAPI]

10 changes: 10 additions & 0 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,10 @@
 <id>bukkit-repo</id>
 <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 </repository>
 <repository>
 <id>placeholderapi</id>
 <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 </repository>
 </repositories>

 <modules>
Expand DownExpand Up@@ -68,6 +72,12 @@
 <version>1.12.2</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>me.clip</groupId>
 <artifactId>placeholderapi</artifactId>
 <version>LATEST</version>
 <scope>provided</scope>
 </dependency>
 </dependencies>

 <build>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add PlaceholderAPI support#2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mdcfe
wants to merge
14
commits into

from

 Closed


Add PlaceholderAPI support
#2041
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
8262037

Adding the option to use PlaceholderAPI chat format internally


Banbeucmas Apr 1, 2018
d36d1e6

Update pom.xml


Banbeucmas Apr 1, 2018
87549f8

Switching method to FormatUtils


Banbeucmas Apr 1, 2018
3603d23

Only check whether PAPI is enabled first time


mdcfe Apr 3, 2018
9da486f

Add placeholderAPIFormat overload


mdcfe Apr 3, 2018
fe93124

Use PlaceholderAPI in quit message


Banbeucmas Apr 3, 2018
6b609f5

Use PlaceholderAPI in join message


Banbeucmas Apr 3, 2018
4de18a0

Include PAPI formatting in KeywordReplacer


mdcfe Apr 3, 2018
d93f413

Use PluginEvent to handle PlaceholderAPI load.


Banbeucmas Apr 7, 2018
9a4bc39

Why is it null?


Banbeucmas Apr 7, 2018
8acb007

Keep it null and adding null check for listener


Banbeucmas Apr 7, 2018
bf596ca

Format messages in User#sendMessage


md678685 Jun 14, 2018
3dc3f69

Implement FakePluginManager.isPluginEnabled


md678685 Jun 14, 2018
4a6437e

Fix quit message replacement


md678685 Jun 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.LocationUtil;
import net.ess3.api.IEssentials;
import net.ess3.nms.refl.ReflUtil;
Expand DownExpand Up@@ -152,7 +153,12 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
 event.setQuitMessage(null);
 } else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
 final Player player = event.getPlayer();
 event.setQuitMessage(ess.getSettings().getCustomQuitMessage().replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()));
 String quitMessage = ess.getSettings().getCustomQuitMessage()
 .replace("{PLAYER}", player.getDisplayName())
 .replace("{USERNAME}", player.getName());
 //Untested, should work tho
 quitMessage = FormatUtil.placeholderAPIFormat(user, quitMessage);
 event.setQuitMessage(quitMessage);
 }

 user.startTransaction();
Expand DownExpand Up@@ -256,9 +262,11 @@ public void run() {
 } else if (message == null) {
 //NOOP
 } else if (ess.getSettings().isCustomJoinMessage()) {
 //Untested, should work tho
 String msg = ess.getSettings().getCustomJoinMessage()
 .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
 .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()));
 msg = FormatUtil.placeholderAPIFormat(player, msg);
 ess.getServer().broadcastMessage(msg);
 } else if (ess.getSettings().allowSilentJoinQuit()) {
 ess.getServer().broadcastMessage(message);
Expand Down

10 changes: 10 additions & 0 deletions
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
package com.earth2me.essentials;

import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand DownExpand Up@@ -29,6 +31,10 @@ public void onPluginEnable(final PluginEnableEvent event) {
 if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) {
 ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 }

 if((FormatUtil.papiEnabled == null || !FormatUtil.papiEnabled) && event.getPlugin().getName().equals("PlaceholderAPI")) {
 FormatUtil.papiEnabled = true;
 }
 }

 @EventHandler(priority = EventPriority.MONITOR)
Expand All@@ -42,6 +48,10 @@ public void onPluginDisable(final PluginDisableEvent event) {
 Methods.reset();
 ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
 }

 if(FormatUtil.papiEnabled != null && FormatUtil.papiEnabled && event.getPlugin().getName().equals("PlaceholderAPI")){
 FormatUtil.papiEnabled = false;
 }
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
Essentials/src/com/earth2me/essentials/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,6 +784,7 @@ public void setRecipeSee(boolean recipeSee) {
 @Override
 public void sendMessage(String message) {
 if (!message.isEmpty()) {
 message = FormatUtil.placeholderAPIFormat(this, message);
 base.sendMessage(message);
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Location;
Expand DownExpand Up@@ -74,6 +75,7 @@ private void replaceKeywords(final CommandSource sender) {

 for (int i = 0; i < input.getLines().size(); i++) {
 String line = input.getLines().get(i);
 line = FormatUtil.placeholderAPIFormat(user, line);
 final Matcher matcher = KEYWORD.matcher(line);

 while (matcher.find()) {
Expand Down

28 changes: 28 additions & 0 deletions
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
package com.earth2me.essentials.utils;

import me.clip.placeholderapi.PlaceholderAPI;
import net.ess3.api.IUser;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;

import java.util.regex.Pattern;

Expand All@@ -22,6 +25,9 @@ public class FormatUtil {
 static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
 public static final Pattern IPPATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");

 //If we are going to make this static, should we move it?
 public static Boolean papiEnabled = null;

 //This method is used to simply strip the native minecraft colour codes
 public static String stripFormat(final String input) {
 if (input == null) {
Expand All@@ -38,6 +44,28 @@ public static String stripEssentialsFormat(final String input) {
 return stripColor(input, REPLACE_ALL_PATTERN);
 }

 public static String placeholderAPIFormat(final IUser user, final String input) {
 return placeholderAPIFormat(user.getBase(), input);
 }

 //Formatting PlaceholderAPI Placeholders, returns the original string if the plugin isn't enabled
 //Seperate this from #getChatFormat() in ISettings due to the requirement of Player as an argument
 public static String placeholderAPIFormat(final Player player, final String input) {
 if (input == null) {
 return null;
 }

 if (papiEnabled == null) {
 papiEnabled = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
 }

 //Checking here instead, please tell me if there is a better way
 if (papiEnabled) {
 return PlaceholderAPI.setPlaceholders(player, input);
 }
 return input;
 }

 //This is the general permission sensitive message format function, checks for urls.
 public static String formatMessage(final IUser user, final String permBase, final String input) {
 if (input == null) {
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials
version: ${full.version}
website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally, drtshock, vemacs, SupaHam, md678685]
commands:
 afk:
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/test/com/earth2me/essentials/FakeServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ public Plugin[] getPlugins() {

 @Override
 public boolean isPluginEnabled(String name) {
throw new UnsupportedOperationException("Not supported yet.");
return name.equals("Essentials");
 }

 @Override
Expand Down

3 changes: 3 additions & 0 deletions
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand DownExpand Up@@ -57,6 +58,8 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
 format = format.replace("{5}", team == null ? "" : team.getDisplayName());
 format = format.replace("{6}", prefix);
 format = format.replace("{7}", suffix);
 format = FormatUtil.placeholderAPIFormat(user, format);

 synchronized (format) {
 event.setFormat(format);
 }
Expand Down

2 changes: 1 addition & 1 deletion
EssentialsChat/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,4 +7,4 @@ website: http://tiny.cc/EssentialsCommands
description: Provides chat control features for Essentials. Requires Permissions.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
depend: [Essentials]
#softdepend: [Factions]
softdepend: [PlaceholderAPI]

10 changes: 10 additions & 0 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,10 @@
 <id>bukkit-repo</id>
 <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 </repository>
 <repository>
 <id>placeholderapi</id>
 <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 </repository>
 </repositories>

 <modules>
Expand DownExpand Up@@ -68,6 +72,12 @@
 <version>1.12.2</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>me.clip</groupId>
 <artifactId>placeholderapi</artifactId>
 <version>LATEST</version>
 <scope>provided</scope>
 </dependency>
 </dependencies>

 <build>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add PlaceholderAPI support#2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mdcfe
wants to merge
14
commits into

from

 Closed


Add PlaceholderAPI support
#2041
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
8262037

Adding the option to use PlaceholderAPI chat format internally


Banbeucmas Apr 1, 2018
d36d1e6

Update pom.xml


Banbeucmas Apr 1, 2018
87549f8

Switching method to FormatUtils


Banbeucmas Apr 1, 2018
3603d23

Only check whether PAPI is enabled first time


mdcfe Apr 3, 2018
9da486f

Add placeholderAPIFormat overload


mdcfe Apr 3, 2018
fe93124

Use PlaceholderAPI in quit message


Banbeucmas Apr 3, 2018
6b609f5

Use PlaceholderAPI in join message


Banbeucmas Apr 3, 2018
4de18a0

Include PAPI formatting in KeywordReplacer


mdcfe Apr 3, 2018
d93f413

Use PluginEvent to handle PlaceholderAPI load.


Banbeucmas Apr 7, 2018
9a4bc39

Why is it null?


Banbeucmas Apr 7, 2018
8acb007

Keep it null and adding null check for listener


Banbeucmas Apr 7, 2018
bf596ca

Format messages in User#sendMessage


md678685 Jun 14, 2018
3dc3f69

Implement FakePluginManager.isPluginEnabled


md678685 Jun 14, 2018
4a6437e

Fix quit message replacement


md678685 Jun 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.LocationUtil;
import net.ess3.api.IEssentials;
import net.ess3.nms.refl.ReflUtil;
Expand DownExpand Up@@ -152,7 +153,12 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
 event.setQuitMessage(null);
 } else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
 final Player player = event.getPlayer();
 event.setQuitMessage(ess.getSettings().getCustomQuitMessage().replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()));
 String quitMessage = ess.getSettings().getCustomQuitMessage()
 .replace("{PLAYER}", player.getDisplayName())
 .replace("{USERNAME}", player.getName());
 //Untested, should work tho
 quitMessage = FormatUtil.placeholderAPIFormat(user, quitMessage);
 event.setQuitMessage(quitMessage);
 }

 user.startTransaction();
Expand DownExpand Up@@ -256,9 +262,11 @@ public void run() {
 } else if (message == null) {
 //NOOP
 } else if (ess.getSettings().isCustomJoinMessage()) {
 //Untested, should work tho
 String msg = ess.getSettings().getCustomJoinMessage()
 .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
 .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()));
 msg = FormatUtil.placeholderAPIFormat(player, msg);
 ess.getServer().broadcastMessage(msg);
 } else if (ess.getSettings().allowSilentJoinQuit()) {
 ess.getServer().broadcastMessage(message);
Expand Down

10 changes: 10 additions & 0 deletions
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
package com.earth2me.essentials;

import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand DownExpand Up@@ -29,6 +31,10 @@ public void onPluginEnable(final PluginEnableEvent event) {
 if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) {
 ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 }

 if((FormatUtil.papiEnabled == null || !FormatUtil.papiEnabled) && event.getPlugin().getName().equals("PlaceholderAPI")) {
 FormatUtil.papiEnabled = true;
 }
 }

 @EventHandler(priority = EventPriority.MONITOR)
Expand All@@ -42,6 +48,10 @@ public void onPluginDisable(final PluginDisableEvent event) {
 Methods.reset();
 ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
 }

 if(FormatUtil.papiEnabled != null && FormatUtil.papiEnabled && event.getPlugin().getName().equals("PlaceholderAPI")){
 FormatUtil.papiEnabled = false;
 }
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
Essentials/src/com/earth2me/essentials/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,6 +784,7 @@ public void setRecipeSee(boolean recipeSee) {
 @Override
 public void sendMessage(String message) {
 if (!message.isEmpty()) {
 message = FormatUtil.placeholderAPIFormat(this, message);
 base.sendMessage(message);
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Location;
Expand DownExpand Up@@ -74,6 +75,7 @@ private void replaceKeywords(final CommandSource sender) {

 for (int i = 0; i < input.getLines().size(); i++) {
 String line = input.getLines().get(i);
 line = FormatUtil.placeholderAPIFormat(user, line);
 final Matcher matcher = KEYWORD.matcher(line);

 while (matcher.find()) {
Expand Down

28 changes: 28 additions & 0 deletions
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
package com.earth2me.essentials.utils;

import me.clip.placeholderapi.PlaceholderAPI;
import net.ess3.api.IUser;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;

import java.util.regex.Pattern;

Expand All@@ -22,6 +25,9 @@ public class FormatUtil {
 static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
 public static final Pattern IPPATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");

 //If we are going to make this static, should we move it?
 public static Boolean papiEnabled = null;

 //This method is used to simply strip the native minecraft colour codes
 public static String stripFormat(final String input) {
 if (input == null) {
Expand All@@ -38,6 +44,28 @@ public static String stripEssentialsFormat(final String input) {
 return stripColor(input, REPLACE_ALL_PATTERN);
 }

 public static String placeholderAPIFormat(final IUser user, final String input) {
 return placeholderAPIFormat(user.getBase(), input);
 }

 //Formatting PlaceholderAPI Placeholders, returns the original string if the plugin isn't enabled
 //Seperate this from #getChatFormat() in ISettings due to the requirement of Player as an argument
 public static String placeholderAPIFormat(final Player player, final String input) {
 if (input == null) {
 return null;
 }

 if (papiEnabled == null) {
 papiEnabled = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
 }

 //Checking here instead, please tell me if there is a better way
 if (papiEnabled) {
 return PlaceholderAPI.setPlaceholders(player, input);
 }
 return input;
 }

 //This is the general permission sensitive message format function, checks for urls.
 public static String formatMessage(final IUser user, final String permBase, final String input) {
 if (input == null) {
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials
version: ${full.version}
website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally, drtshock, vemacs, SupaHam, md678685]
commands:
 afk:
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/test/com/earth2me/essentials/FakeServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ public Plugin[] getPlugins() {

 @Override
 public boolean isPluginEnabled(String name) {
throw new UnsupportedOperationException("Not supported yet.");
return name.equals("Essentials");
 }

 @Override
Expand Down

3 changes: 3 additions & 0 deletions
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand DownExpand Up@@ -57,6 +58,8 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
 format = format.replace("{5}", team == null ? "" : team.getDisplayName());
 format = format.replace("{6}", prefix);
 format = format.replace("{7}", suffix);
 format = FormatUtil.placeholderAPIFormat(user, format);

 synchronized (format) {
 event.setFormat(format);
 }
Expand Down

2 changes: 1 addition & 1 deletion
EssentialsChat/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,4 +7,4 @@ website: http://tiny.cc/EssentialsCommands
description: Provides chat control features for Essentials. Requires Permissions.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
depend: [Essentials]
#softdepend: [Factions]
softdepend: [PlaceholderAPI]

10 changes: 10 additions & 0 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,10 @@
 <id>bukkit-repo</id>
 <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 </repository>
 <repository>
 <id>placeholderapi</id>
 <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 </repository>
 </repositories>

 <modules>
Expand DownExpand Up@@ -68,6 +72,12 @@
 <version>1.12.2</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>me.clip</groupId>
 <artifactId>placeholderapi</artifactId>
 <version>LATEST</version>
 <scope>provided</scope>
 </dependency>
 </dependencies>

 <build>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add PlaceholderAPI support#2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mdcfe
wants to merge
14
commits into

from

 Closed


Add PlaceholderAPI support
#2041
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
8262037

Adding the option to use PlaceholderAPI chat format internally


Banbeucmas Apr 1, 2018
d36d1e6

Update pom.xml


Banbeucmas Apr 1, 2018
87549f8

Switching method to FormatUtils


Banbeucmas Apr 1, 2018
3603d23

Only check whether PAPI is enabled first time


mdcfe Apr 3, 2018
9da486f

Add placeholderAPIFormat overload


mdcfe Apr 3, 2018
fe93124

Use PlaceholderAPI in quit message


Banbeucmas Apr 3, 2018
6b609f5

Use PlaceholderAPI in join message


Banbeucmas Apr 3, 2018
4de18a0

Include PAPI formatting in KeywordReplacer


mdcfe Apr 3, 2018
d93f413

Use PluginEvent to handle PlaceholderAPI load.


Banbeucmas Apr 7, 2018
9a4bc39

Why is it null?


Banbeucmas Apr 7, 2018
8acb007

Keep it null and adding null check for listener


Banbeucmas Apr 7, 2018
bf596ca

Format messages in User#sendMessage


md678685 Jun 14, 2018
3dc3f69

Implement FakePluginManager.isPluginEnabled


md678685 Jun 14, 2018
4a6437e

Fix quit message replacement


md678685 Jun 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.LocationUtil;
import net.ess3.api.IEssentials;
import net.ess3.nms.refl.ReflUtil;
Expand DownExpand Up@@ -152,7 +153,12 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
 event.setQuitMessage(null);
 } else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
 final Player player = event.getPlayer();
 event.setQuitMessage(ess.getSettings().getCustomQuitMessage().replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()));
 String quitMessage = ess.getSettings().getCustomQuitMessage()
 .replace("{PLAYER}", player.getDisplayName())
 .replace("{USERNAME}", player.getName());
 //Untested, should work tho
 quitMessage = FormatUtil.placeholderAPIFormat(user, quitMessage);
 event.setQuitMessage(quitMessage);
 }

 user.startTransaction();
Expand DownExpand Up@@ -256,9 +262,11 @@ public void run() {
 } else if (message == null) {
 //NOOP
 } else if (ess.getSettings().isCustomJoinMessage()) {
 //Untested, should work tho
 String msg = ess.getSettings().getCustomJoinMessage()
 .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
 .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()));
 msg = FormatUtil.placeholderAPIFormat(player, msg);
 ess.getServer().broadcastMessage(msg);
 } else if (ess.getSettings().allowSilentJoinQuit()) {
 ess.getServer().broadcastMessage(message);
Expand Down

10 changes: 10 additions & 0 deletions
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
package com.earth2me.essentials;

import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand DownExpand Up@@ -29,6 +31,10 @@ public void onPluginEnable(final PluginEnableEvent event) {
 if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) {
 ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 }

 if((FormatUtil.papiEnabled == null || !FormatUtil.papiEnabled) && event.getPlugin().getName().equals("PlaceholderAPI")) {
 FormatUtil.papiEnabled = true;
 }
 }

 @EventHandler(priority = EventPriority.MONITOR)
Expand All@@ -42,6 +48,10 @@ public void onPluginDisable(final PluginDisableEvent event) {
 Methods.reset();
 ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
 }

 if(FormatUtil.papiEnabled != null && FormatUtil.papiEnabled && event.getPlugin().getName().equals("PlaceholderAPI")){
 FormatUtil.papiEnabled = false;
 }
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
Essentials/src/com/earth2me/essentials/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,6 +784,7 @@ public void setRecipeSee(boolean recipeSee) {
 @Override
 public void sendMessage(String message) {
 if (!message.isEmpty()) {
 message = FormatUtil.placeholderAPIFormat(this, message);
 base.sendMessage(message);
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Location;
Expand DownExpand Up@@ -74,6 +75,7 @@ private void replaceKeywords(final CommandSource sender) {

 for (int i = 0; i < input.getLines().size(); i++) {
 String line = input.getLines().get(i);
 line = FormatUtil.placeholderAPIFormat(user, line);
 final Matcher matcher = KEYWORD.matcher(line);

 while (matcher.find()) {
Expand Down

28 changes: 28 additions & 0 deletions
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
package com.earth2me.essentials.utils;

import me.clip.placeholderapi.PlaceholderAPI;
import net.ess3.api.IUser;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;

import java.util.regex.Pattern;

Expand All@@ -22,6 +25,9 @@ public class FormatUtil {
 static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
 public static final Pattern IPPATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");

 //If we are going to make this static, should we move it?
 public static Boolean papiEnabled = null;

 //This method is used to simply strip the native minecraft colour codes
 public static String stripFormat(final String input) {
 if (input == null) {
Expand All@@ -38,6 +44,28 @@ public static String stripEssentialsFormat(final String input) {
 return stripColor(input, REPLACE_ALL_PATTERN);
 }

 public static String placeholderAPIFormat(final IUser user, final String input) {
 return placeholderAPIFormat(user.getBase(), input);
 }

 //Formatting PlaceholderAPI Placeholders, returns the original string if the plugin isn't enabled
 //Seperate this from #getChatFormat() in ISettings due to the requirement of Player as an argument
 public static String placeholderAPIFormat(final Player player, final String input) {
 if (input == null) {
 return null;
 }

 if (papiEnabled == null) {
 papiEnabled = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
 }

 //Checking here instead, please tell me if there is a better way
 if (papiEnabled) {
 return PlaceholderAPI.setPlaceholders(player, input);
 }
 return input;
 }

 //This is the general permission sensitive message format function, checks for urls.
 public static String formatMessage(final IUser user, final String permBase, final String input) {
 if (input == null) {
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials
version: ${full.version}
website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally, drtshock, vemacs, SupaHam, md678685]
commands:
 afk:
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/test/com/earth2me/essentials/FakeServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ public Plugin[] getPlugins() {

 @Override
 public boolean isPluginEnabled(String name) {
throw new UnsupportedOperationException("Not supported yet.");
return name.equals("Essentials");
 }

 @Override
Expand Down

3 changes: 3 additions & 0 deletions
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand DownExpand Up@@ -57,6 +58,8 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
 format = format.replace("{5}", team == null ? "" : team.getDisplayName());
 format = format.replace("{6}", prefix);
 format = format.replace("{7}", suffix);
 format = FormatUtil.placeholderAPIFormat(user, format);

 synchronized (format) {
 event.setFormat(format);
 }
Expand Down

2 changes: 1 addition & 1 deletion
EssentialsChat/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,4 +7,4 @@ website: http://tiny.cc/EssentialsCommands
description: Provides chat control features for Essentials. Requires Permissions.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
depend: [Essentials]
#softdepend: [Factions]
softdepend: [PlaceholderAPI]

10 changes: 10 additions & 0 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,10 @@
 <id>bukkit-repo</id>
 <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 </repository>
 <repository>
 <id>placeholderapi</id>
 <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 </repository>
 </repositories>

 <modules>
Expand DownExpand Up@@ -68,6 +72,12 @@
 <version>1.12.2</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>me.clip</groupId>
 <artifactId>placeholderapi</artifactId>
 <version>LATEST</version>
 <scope>provided</scope>
 </dependency>
 </dependencies>

 <build>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add PlaceholderAPI support#2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mdcfe
wants to merge
14
commits into

from

 Closed


Add PlaceholderAPI support
#2041
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
8262037

Adding the option to use PlaceholderAPI chat format internally


Banbeucmas Apr 1, 2018
d36d1e6

Update pom.xml


Banbeucmas Apr 1, 2018
87549f8

Switching method to FormatUtils


Banbeucmas Apr 1, 2018
3603d23

Only check whether PAPI is enabled first time


mdcfe Apr 3, 2018
9da486f

Add placeholderAPIFormat overload


mdcfe Apr 3, 2018
fe93124

Use PlaceholderAPI in quit message


Banbeucmas Apr 3, 2018
6b609f5

Use PlaceholderAPI in join message


Banbeucmas Apr 3, 2018
4de18a0

Include PAPI formatting in KeywordReplacer


mdcfe Apr 3, 2018
d93f413

Use PluginEvent to handle PlaceholderAPI load.


Banbeucmas Apr 7, 2018
9a4bc39

Why is it null?


Banbeucmas Apr 7, 2018
8acb007

Keep it null and adding null check for listener


Banbeucmas Apr 7, 2018
bf596ca

Format messages in User#sendMessage


md678685 Jun 14, 2018
3dc3f69

Implement FakePluginManager.isPluginEnabled


md678685 Jun 14, 2018
4a6437e

Fix quit message replacement


md678685 Jun 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.LocationUtil;
import net.ess3.api.IEssentials;
import net.ess3.nms.refl.ReflUtil;
Expand DownExpand Up@@ -152,7 +153,12 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
 event.setQuitMessage(null);
 } else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
 final Player player = event.getPlayer();
 event.setQuitMessage(ess.getSettings().getCustomQuitMessage().replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()));
 String quitMessage = ess.getSettings().getCustomQuitMessage()
 .replace("{PLAYER}", player.getDisplayName())
 .replace("{USERNAME}", player.getName());
 //Untested, should work tho
 quitMessage = FormatUtil.placeholderAPIFormat(user, quitMessage);
 event.setQuitMessage(quitMessage);
 }

 user.startTransaction();
Expand DownExpand Up@@ -256,9 +262,11 @@ public void run() {
 } else if (message == null) {
 //NOOP
 } else if (ess.getSettings().isCustomJoinMessage()) {
 //Untested, should work tho
 String msg = ess.getSettings().getCustomJoinMessage()
 .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
 .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()));
 msg = FormatUtil.placeholderAPIFormat(player, msg);
 ess.getServer().broadcastMessage(msg);
 } else if (ess.getSettings().allowSilentJoinQuit()) {
 ess.getServer().broadcastMessage(message);
Expand Down

10 changes: 10 additions & 0 deletions
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
package com.earth2me.essentials;

import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand DownExpand Up@@ -29,6 +31,10 @@ public void onPluginEnable(final PluginEnableEvent event) {
 if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) {
 ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 }

 if((FormatUtil.papiEnabled == null || !FormatUtil.papiEnabled) && event.getPlugin().getName().equals("PlaceholderAPI")) {
 FormatUtil.papiEnabled = true;
 }
 }

 @EventHandler(priority = EventPriority.MONITOR)
Expand All@@ -42,6 +48,10 @@ public void onPluginDisable(final PluginDisableEvent event) {
 Methods.reset();
 ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
 }

 if(FormatUtil.papiEnabled != null && FormatUtil.papiEnabled && event.getPlugin().getName().equals("PlaceholderAPI")){
 FormatUtil.papiEnabled = false;
 }
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
Essentials/src/com/earth2me/essentials/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,6 +784,7 @@ public void setRecipeSee(boolean recipeSee) {
 @Override
 public void sendMessage(String message) {
 if (!message.isEmpty()) {
 message = FormatUtil.placeholderAPIFormat(this, message);
 base.sendMessage(message);
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Location;
Expand DownExpand Up@@ -74,6 +75,7 @@ private void replaceKeywords(final CommandSource sender) {

 for (int i = 0; i < input.getLines().size(); i++) {
 String line = input.getLines().get(i);
 line = FormatUtil.placeholderAPIFormat(user, line);
 final Matcher matcher = KEYWORD.matcher(line);

 while (matcher.find()) {
Expand Down

28 changes: 28 additions & 0 deletions
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
package com.earth2me.essentials.utils;

import me.clip.placeholderapi.PlaceholderAPI;
import net.ess3.api.IUser;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;

import java.util.regex.Pattern;

Expand All@@ -22,6 +25,9 @@ public class FormatUtil {
 static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
 public static final Pattern IPPATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");

 //If we are going to make this static, should we move it?
 public static Boolean papiEnabled = null;

 //This method is used to simply strip the native minecraft colour codes
 public static String stripFormat(final String input) {
 if (input == null) {
Expand All@@ -38,6 +44,28 @@ public static String stripEssentialsFormat(final String input) {
 return stripColor(input, REPLACE_ALL_PATTERN);
 }

 public static String placeholderAPIFormat(final IUser user, final String input) {
 return placeholderAPIFormat(user.getBase(), input);
 }

 //Formatting PlaceholderAPI Placeholders, returns the original string if the plugin isn't enabled
 //Seperate this from #getChatFormat() in ISettings due to the requirement of Player as an argument
 public static String placeholderAPIFormat(final Player player, final String input) {
 if (input == null) {
 return null;
 }

 if (papiEnabled == null) {
 papiEnabled = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
 }

 //Checking here instead, please tell me if there is a better way
 if (papiEnabled) {
 return PlaceholderAPI.setPlaceholders(player, input);
 }
 return input;
 }

 //This is the general permission sensitive message format function, checks for urls.
 public static String formatMessage(final IUser user, final String permBase, final String input) {
 if (input == null) {
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials
version: ${full.version}
website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally, drtshock, vemacs, SupaHam, md678685]
commands:
 afk:
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/test/com/earth2me/essentials/FakeServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ public Plugin[] getPlugins() {

 @Override
 public boolean isPluginEnabled(String name) {
throw new UnsupportedOperationException("Not supported yet.");
return name.equals("Essentials");
 }

 @Override
Expand Down

3 changes: 3 additions & 0 deletions
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand DownExpand Up@@ -57,6 +58,8 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
 format = format.replace("{5}", team == null ? "" : team.getDisplayName());
 format = format.replace("{6}", prefix);
 format = format.replace("{7}", suffix);
 format = FormatUtil.placeholderAPIFormat(user, format);

 synchronized (format) {
 event.setFormat(format);
 }
Expand Down

2 changes: 1 addition & 1 deletion
EssentialsChat/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,4 +7,4 @@ website: http://tiny.cc/EssentialsCommands
description: Provides chat control features for Essentials. Requires Permissions.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
depend: [Essentials]
#softdepend: [Factions]
softdepend: [PlaceholderAPI]

10 changes: 10 additions & 0 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,10 @@
 <id>bukkit-repo</id>
 <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 </repository>
 <repository>
 <id>placeholderapi</id>
 <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 </repository>
 </repositories>

 <modules>
Expand DownExpand Up@@ -68,6 +72,12 @@
 <version>1.12.2</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>me.clip</groupId>
 <artifactId>placeholderapi</artifactId>
 <version>LATEST</version>
 <scope>provided</scope>
 </dependency>
 </dependencies>

 <build>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add PlaceholderAPI support#2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mdcfe
wants to merge
14
commits into

from

 Closed


Add PlaceholderAPI support
#2041
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
8262037

Adding the option to use PlaceholderAPI chat format internally


Banbeucmas Apr 1, 2018
d36d1e6

Update pom.xml


Banbeucmas Apr 1, 2018
87549f8

Switching method to FormatUtils


Banbeucmas Apr 1, 2018
3603d23

Only check whether PAPI is enabled first time


mdcfe Apr 3, 2018
9da486f

Add placeholderAPIFormat overload


mdcfe Apr 3, 2018
fe93124

Use PlaceholderAPI in quit message


Banbeucmas Apr 3, 2018
6b609f5

Use PlaceholderAPI in join message


Banbeucmas Apr 3, 2018
4de18a0

Include PAPI formatting in KeywordReplacer


mdcfe Apr 3, 2018
d93f413

Use PluginEvent to handle PlaceholderAPI load.


Banbeucmas Apr 7, 2018
9a4bc39

Why is it null?


Banbeucmas Apr 7, 2018
8acb007

Keep it null and adding null check for listener


Banbeucmas Apr 7, 2018
bf596ca

Format messages in User#sendMessage


md678685 Jun 14, 2018
3dc3f69

Implement FakePluginManager.isPluginEnabled


md678685 Jun 14, 2018
4a6437e

Fix quit message replacement


md678685 Jun 15, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 9 additions & 1 deletion
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.LocationUtil;
import net.ess3.api.IEssentials;
import net.ess3.nms.refl.ReflUtil;
Expand DownExpand Up@@ -152,7 +153,12 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
 event.setQuitMessage(null);
 } else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
 final Player player = event.getPlayer();
 event.setQuitMessage(ess.getSettings().getCustomQuitMessage().replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()));
 String quitMessage = ess.getSettings().getCustomQuitMessage()
 .replace("{PLAYER}", player.getDisplayName())
 .replace("{USERNAME}", player.getName());
 //Untested, should work tho
 quitMessage = FormatUtil.placeholderAPIFormat(user, quitMessage);
 event.setQuitMessage(quitMessage);
 }

 user.startTransaction();
Expand DownExpand Up@@ -256,9 +262,11 @@ public void run() {
 } else if (message == null) {
 //NOOP
 } else if (ess.getSettings().isCustomJoinMessage()) {
 //Untested, should work tho
 String msg = ess.getSettings().getCustomJoinMessage()
 .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
 .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()));
 msg = FormatUtil.placeholderAPIFormat(player, msg);
 ess.getServer().broadcastMessage(msg);
 } else if (ess.getSettings().allowSilentJoinQuit()) {
 ess.getServer().broadcastMessage(message);
Expand Down

10 changes: 10 additions & 0 deletions
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
package com.earth2me.essentials;

import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand DownExpand Up@@ -29,6 +31,10 @@ public void onPluginEnable(final PluginEnableEvent event) {
 if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) {
 ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 }

 if((FormatUtil.papiEnabled == null || !FormatUtil.papiEnabled) && event.getPlugin().getName().equals("PlaceholderAPI")) {
 FormatUtil.papiEnabled = true;
 }
 }

 @EventHandler(priority = EventPriority.MONITOR)
Expand All@@ -42,6 +48,10 @@ public void onPluginDisable(final PluginDisableEvent event) {
 Methods.reset();
 ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
 }

 if(FormatUtil.papiEnabled != null && FormatUtil.papiEnabled && event.getPlugin().getName().equals("PlaceholderAPI")){
 FormatUtil.papiEnabled = false;
 }
 }

 @Override
Expand Down

1 change: 1 addition & 0 deletions
Essentials/src/com/earth2me/essentials/User.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,6 +784,7 @@ public void setRecipeSee(boolean recipeSee) {
 @Override
 public void sendMessage(String message) {
 if (!message.isEmpty()) {
 message = FormatUtil.placeholderAPIFormat(this, message);
 base.sendMessage(message);
 }
 }
Expand Down

2 changes: 2 additions & 0 deletions
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Location;
Expand DownExpand Up@@ -74,6 +75,7 @@ private void replaceKeywords(final CommandSource sender) {

 for (int i = 0; i < input.getLines().size(); i++) {
 String line = input.getLines().get(i);
 line = FormatUtil.placeholderAPIFormat(user, line);
 final Matcher matcher = KEYWORD.matcher(line);

 while (matcher.find()) {
Expand Down

28 changes: 28 additions & 0 deletions
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
package com.earth2me.essentials.utils;

import me.clip.placeholderapi.PlaceholderAPI;
import net.ess3.api.IUser;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;

import java.util.regex.Pattern;

Expand All@@ -22,6 +25,9 @@ public class FormatUtil {
 static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
 public static final Pattern IPPATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");

 //If we are going to make this static, should we move it?
 public static Boolean papiEnabled = null;

 //This method is used to simply strip the native minecraft colour codes
 public static String stripFormat(final String input) {
 if (input == null) {
Expand All@@ -38,6 +44,28 @@ public static String stripEssentialsFormat(final String input) {
 return stripColor(input, REPLACE_ALL_PATTERN);
 }

 public static String placeholderAPIFormat(final IUser user, final String input) {
 return placeholderAPIFormat(user.getBase(), input);
 }

 //Formatting PlaceholderAPI Placeholders, returns the original string if the plugin isn't enabled
 //Seperate this from #getChatFormat() in ISettings due to the requirement of Player as an argument
 public static String placeholderAPIFormat(final Player player, final String input) {
 if (input == null) {
 return null;
 }

 if (papiEnabled == null) {
 papiEnabled = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
 }

 //Checking here instead, please tell me if there is a better way
 if (papiEnabled) {
 return PlaceholderAPI.setPlaceholders(player, input);
 }
 return input;
 }

 //This is the general permission sensitive message format function, checks for urls.
 public static String formatMessage(final IUser user, final String permBase, final String input) {
 if (input == null) {
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials
version: ${full.version}
website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally, drtshock, vemacs, SupaHam, md678685]
commands:
 afk:
Expand Down

2 changes: 1 addition & 1 deletion
Essentials/test/com/earth2me/essentials/FakeServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ public Plugin[] getPlugins() {

 @Override
 public boolean isPluginEnabled(String name) {
throw new UnsupportedOperationException("Not supported yet.");
return name.equals("Essentials");
 }

 @Override
Expand Down

3 changes: 3 additions & 0 deletions
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand DownExpand Up@@ -57,6 +58,8 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
 format = format.replace("{5}", team == null ? "" : team.getDisplayName());
 format = format.replace("{6}", prefix);
 format = format.replace("{7}", suffix);
 format = FormatUtil.placeholderAPIFormat(user, format);

 synchronized (format) {
 event.setFormat(format);
 }
Expand Down

2 changes: 1 addition & 1 deletion
EssentialsChat/src/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,4 +7,4 @@ website: http://tiny.cc/EssentialsCommands
description: Provides chat control features for Essentials. Requires Permissions.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
depend: [Essentials]
#softdepend: [Factions]
softdepend: [PlaceholderAPI]

10 changes: 10 additions & 0 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,10 @@
 <id>bukkit-repo</id>
 <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 </repository>
 <repository>
 <id>placeholderapi</id>
 <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 </repository>
 </repositories>

 <modules>
Expand DownExpand Up@@ -68,6 +72,12 @@
 <version>1.12.2</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>me.clip</groupId>
 <artifactId>placeholderapi</artifactId>
 <version>LATEST</version>
 <scope>provided</scope>
 </dependency>
 </dependencies>

 <build>
Expand Down