Skip to content

Adding Placeholder API Compability internally [WIP] - #1944

Closed
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi
Closed

Adding Placeholder API Compability internally [WIP]#1944
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi

Conversation

@Banbeucmas

Copy link
Copy Markdown
Contributor

Pretty sure I want this to be an enhancement in 2.16.0
Still WIP tho.

Just that the placeholder seem to work flawlessly with PlaceholderAPI 2.8.5 tested

image

image

I hope my pr didn't fucked up lol. Haven't try to merge specific branch yet

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Yep it fucked up

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

A little note:
image

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

As for registering our own placeholder, https://github.com/PlaceholderAPI/Essentials-Expansion is already here, I think it is better to just continue to contribute there rather than putting them internally onto Essentials

@BanbeucmasBanbeucmas mentioned this pull request Apr 1, 2018
@mdcfemdcfe added the type: enhancement Features and feature requests. label Apr 2, 2018
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

mdcfe added 5 commits April 3, 2018 11:23
Not sure if this is necessary - thoughts?
This will need to be manually changed everywhere `tl` is used where placeholders may be expected.
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Nice one.

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plugin.yml might need some work

website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1945
You once said you don't want to add it as sofedepend.
Will we remove this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot about that. Still need to implement handling of PAPI loading after EssentialsX though before we do that.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will leave that part to you then :)

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was aware of this tho

return null;
}

input = input.replaceAll("\\{|\\}", "%");

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some problem that a single { standing alone will become % after that. I don't use regex for a long time. Should we do something about it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/{([A-Za-z0-9_]+)}/g might work.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@md678685 I love IntelliJ
image

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still need to address this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the replacement with that regex would have been "%$1%", since the ()s in the regex capture the placeholder name (bobsplugin_hunger) and the $1 puts it back in the string once replaced.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love how the problem still excist tho. Idk why but seem like Java Regex behaves different than JS


input = input.replaceAll("\\{|\\}", "%");

if (papiEnabled == null) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be here, in case PAPI loads before EssentialsX - in that instance, Essentials won't receive PAPI's PluginEnableEvent.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is also the reason for the null - at the point that the class is loaded, we won't know whether PAPI is enabled, and it also might not be a safe time to check.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that make sense. Let me change that

//The warp function is a wrapper used to teleportPlayer a player to a /warp
@Override
public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception {
UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be in its own PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this change is in this PR but the actual PR is here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I accidentally create the Papi branch out of the original branch of my fork and PR before even realize it.
We will just solve both PR at the same time or if anyone have a better idea.

@mdcfemdcfe mentioned this pull request Jun 14, 2018
6 tasks
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Should we close this in favor of #2041?

@mdcfe

Copy link
Copy Markdown
Member

@Banbeucmas Yes, closing this PR now.

@mdcfemdcfe closed this Aug 19, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: enhancementFeatures and feature requests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Banbeucmas@mdcfe@drtshock
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Adding Placeholder API Compability internally [WIP] by Banbeucmas · Pull Request #1944 · EssentialsX/Essentials · GitHub
Skip to content

Adding Placeholder API Compability internally [WIP] - #1944

Closed
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi
Closed

Adding Placeholder API Compability internally [WIP]#1944
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi

Conversation

@Banbeucmas

Copy link
Copy Markdown
Contributor

Pretty sure I want this to be an enhancement in 2.16.0
Still WIP tho.

Just that the placeholder seem to work flawlessly with PlaceholderAPI 2.8.5 tested

image

image

I hope my pr didn't fucked up lol. Haven't try to merge specific branch yet

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Yep it fucked up

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

A little note:
image

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

As for registering our own placeholder, https://github.com/PlaceholderAPI/Essentials-Expansion is already here, I think it is better to just continue to contribute there rather than putting them internally onto Essentials

@BanbeucmasBanbeucmas mentioned this pull request Apr 1, 2018
@mdcfemdcfe added the type: enhancement Features and feature requests. label Apr 2, 2018
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

mdcfe added 5 commits April 3, 2018 11:23
Not sure if this is necessary - thoughts?
This will need to be manually changed everywhere `tl` is used where placeholders may be expected.
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Nice one.

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plugin.yml might need some work

website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1945
You once said you don't want to add it as sofedepend.
Will we remove this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot about that. Still need to implement handling of PAPI loading after EssentialsX though before we do that.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will leave that part to you then :)

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was aware of this tho

return null;
}

input = input.replaceAll("\\{|\\}", "%");

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some problem that a single { standing alone will become % after that. I don't use regex for a long time. Should we do something about it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/{([A-Za-z0-9_]+)}/g might work.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@md678685 I love IntelliJ
image

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still need to address this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the replacement with that regex would have been "%$1%", since the ()s in the regex capture the placeholder name (bobsplugin_hunger) and the $1 puts it back in the string once replaced.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love how the problem still excist tho. Idk why but seem like Java Regex behaves different than JS


input = input.replaceAll("\\{|\\}", "%");

if (papiEnabled == null) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be here, in case PAPI loads before EssentialsX - in that instance, Essentials won't receive PAPI's PluginEnableEvent.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is also the reason for the null - at the point that the class is loaded, we won't know whether PAPI is enabled, and it also might not be a safe time to check.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that make sense. Let me change that

//The warp function is a wrapper used to teleportPlayer a player to a /warp
@Override
public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception {
UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be in its own PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this change is in this PR but the actual PR is here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I accidentally create the Papi branch out of the original branch of my fork and PR before even realize it.
We will just solve both PR at the same time or if anyone have a better idea.

@mdcfemdcfe mentioned this pull request Jun 14, 2018
6 tasks
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Should we close this in favor of #2041?

@mdcfe

Copy link
Copy Markdown
Member

@Banbeucmas Yes, closing this PR now.

@mdcfemdcfe closed this Aug 19, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: enhancementFeatures and feature requests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Banbeucmas@mdcfe@drtshock
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Adding Placeholder API Compability internally [WIP] by Banbeucmas · Pull Request #1944 · EssentialsX/Essentials · GitHub
Skip to content

Adding Placeholder API Compability internally [WIP] - #1944

Closed
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi
Closed

Adding Placeholder API Compability internally [WIP]#1944
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi

Conversation

@Banbeucmas

Copy link
Copy Markdown
Contributor

Pretty sure I want this to be an enhancement in 2.16.0
Still WIP tho.

Just that the placeholder seem to work flawlessly with PlaceholderAPI 2.8.5 tested

image

image

I hope my pr didn't fucked up lol. Haven't try to merge specific branch yet

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Yep it fucked up

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

A little note:
image

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

As for registering our own placeholder, https://github.com/PlaceholderAPI/Essentials-Expansion is already here, I think it is better to just continue to contribute there rather than putting them internally onto Essentials

@BanbeucmasBanbeucmas mentioned this pull request Apr 1, 2018
@mdcfemdcfe added the type: enhancement Features and feature requests. label Apr 2, 2018
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

mdcfe added 5 commits April 3, 2018 11:23
Not sure if this is necessary - thoughts?
This will need to be manually changed everywhere `tl` is used where placeholders may be expected.
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Nice one.

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plugin.yml might need some work

website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1945
You once said you don't want to add it as sofedepend.
Will we remove this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot about that. Still need to implement handling of PAPI loading after EssentialsX though before we do that.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will leave that part to you then :)

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was aware of this tho

return null;
}

input = input.replaceAll("\\{|\\}", "%");

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some problem that a single { standing alone will become % after that. I don't use regex for a long time. Should we do something about it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/{([A-Za-z0-9_]+)}/g might work.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@md678685 I love IntelliJ
image

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still need to address this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the replacement with that regex would have been "%$1%", since the ()s in the regex capture the placeholder name (bobsplugin_hunger) and the $1 puts it back in the string once replaced.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love how the problem still excist tho. Idk why but seem like Java Regex behaves different than JS


input = input.replaceAll("\\{|\\}", "%");

if (papiEnabled == null) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be here, in case PAPI loads before EssentialsX - in that instance, Essentials won't receive PAPI's PluginEnableEvent.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is also the reason for the null - at the point that the class is loaded, we won't know whether PAPI is enabled, and it also might not be a safe time to check.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that make sense. Let me change that

//The warp function is a wrapper used to teleportPlayer a player to a /warp
@Override
public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception {
UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be in its own PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this change is in this PR but the actual PR is here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I accidentally create the Papi branch out of the original branch of my fork and PR before even realize it.
We will just solve both PR at the same time or if anyone have a better idea.

@mdcfemdcfe mentioned this pull request Jun 14, 2018
6 tasks
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Should we close this in favor of #2041?

@mdcfe

Copy link
Copy Markdown
Member

@Banbeucmas Yes, closing this PR now.

@mdcfemdcfe closed this Aug 19, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: enhancementFeatures and feature requests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

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

Adding Placeholder API Compability internally [WIP] - #1944

Closed
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi
Closed

Adding Placeholder API Compability internally [WIP]#1944
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi

Conversation

@Banbeucmas

Copy link
Copy Markdown
Contributor

Pretty sure I want this to be an enhancement in 2.16.0
Still WIP tho.

Just that the placeholder seem to work flawlessly with PlaceholderAPI 2.8.5 tested

image

image

I hope my pr didn't fucked up lol. Haven't try to merge specific branch yet

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Yep it fucked up

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

A little note:
image

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

As for registering our own placeholder, https://github.com/PlaceholderAPI/Essentials-Expansion is already here, I think it is better to just continue to contribute there rather than putting them internally onto Essentials

@BanbeucmasBanbeucmas mentioned this pull request Apr 1, 2018
@mdcfemdcfe added the type: enhancement Features and feature requests. label Apr 2, 2018
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

mdcfe added 5 commits April 3, 2018 11:23
Not sure if this is necessary - thoughts?
This will need to be manually changed everywhere `tl` is used where placeholders may be expected.
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Nice one.

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plugin.yml might need some work

website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1945
You once said you don't want to add it as sofedepend.
Will we remove this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot about that. Still need to implement handling of PAPI loading after EssentialsX though before we do that.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will leave that part to you then :)

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was aware of this tho

return null;
}

input = input.replaceAll("\\{|\\}", "%");

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some problem that a single { standing alone will become % after that. I don't use regex for a long time. Should we do something about it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/{([A-Za-z0-9_]+)}/g might work.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@md678685 I love IntelliJ
image

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still need to address this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the replacement with that regex would have been "%$1%", since the ()s in the regex capture the placeholder name (bobsplugin_hunger) and the $1 puts it back in the string once replaced.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love how the problem still excist tho. Idk why but seem like Java Regex behaves different than JS


input = input.replaceAll("\\{|\\}", "%");

if (papiEnabled == null) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be here, in case PAPI loads before EssentialsX - in that instance, Essentials won't receive PAPI's PluginEnableEvent.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is also the reason for the null - at the point that the class is loaded, we won't know whether PAPI is enabled, and it also might not be a safe time to check.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that make sense. Let me change that

//The warp function is a wrapper used to teleportPlayer a player to a /warp
@Override
public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception {
UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be in its own PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this change is in this PR but the actual PR is here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I accidentally create the Papi branch out of the original branch of my fork and PR before even realize it.
We will just solve both PR at the same time or if anyone have a better idea.

@mdcfemdcfe mentioned this pull request Jun 14, 2018
6 tasks
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Should we close this in favor of #2041?

@mdcfe

Copy link
Copy Markdown
Member

@Banbeucmas Yes, closing this PR now.

@mdcfemdcfe closed this Aug 19, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: enhancementFeatures and feature requests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

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

Adding Placeholder API Compability internally [WIP] - #1944

Closed
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi
Closed

Adding Placeholder API Compability internally [WIP]#1944
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi

Conversation

@Banbeucmas

Copy link
Copy Markdown
Contributor

Pretty sure I want this to be an enhancement in 2.16.0
Still WIP tho.

Just that the placeholder seem to work flawlessly with PlaceholderAPI 2.8.5 tested

image

image

I hope my pr didn't fucked up lol. Haven't try to merge specific branch yet

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Yep it fucked up

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

A little note:
image

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

As for registering our own placeholder, https://github.com/PlaceholderAPI/Essentials-Expansion is already here, I think it is better to just continue to contribute there rather than putting them internally onto Essentials

@BanbeucmasBanbeucmas mentioned this pull request Apr 1, 2018
@mdcfemdcfe added the type: enhancement Features and feature requests. label Apr 2, 2018
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

mdcfe added 5 commits April 3, 2018 11:23
Not sure if this is necessary - thoughts?
This will need to be manually changed everywhere `tl` is used where placeholders may be expected.
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Nice one.

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plugin.yml might need some work

website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1945
You once said you don't want to add it as sofedepend.
Will we remove this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot about that. Still need to implement handling of PAPI loading after EssentialsX though before we do that.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will leave that part to you then :)

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was aware of this tho

return null;
}

input = input.replaceAll("\\{|\\}", "%");

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some problem that a single { standing alone will become % after that. I don't use regex for a long time. Should we do something about it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/{([A-Za-z0-9_]+)}/g might work.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@md678685 I love IntelliJ
image

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still need to address this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the replacement with that regex would have been "%$1%", since the ()s in the regex capture the placeholder name (bobsplugin_hunger) and the $1 puts it back in the string once replaced.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love how the problem still excist tho. Idk why but seem like Java Regex behaves different than JS


input = input.replaceAll("\\{|\\}", "%");

if (papiEnabled == null) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be here, in case PAPI loads before EssentialsX - in that instance, Essentials won't receive PAPI's PluginEnableEvent.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is also the reason for the null - at the point that the class is loaded, we won't know whether PAPI is enabled, and it also might not be a safe time to check.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that make sense. Let me change that

//The warp function is a wrapper used to teleportPlayer a player to a /warp
@Override
public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception {
UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be in its own PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this change is in this PR but the actual PR is here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I accidentally create the Papi branch out of the original branch of my fork and PR before even realize it.
We will just solve both PR at the same time or if anyone have a better idea.

@mdcfemdcfe mentioned this pull request Jun 14, 2018
6 tasks
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Should we close this in favor of #2041?

@mdcfe

Copy link
Copy Markdown
Member

@Banbeucmas Yes, closing this PR now.

@mdcfemdcfe closed this Aug 19, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: enhancementFeatures and feature requests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Banbeucmas@mdcfe@drtshock
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Adding Placeholder API Compability internally [WIP] by Banbeucmas · Pull Request #1944 · EssentialsX/Essentials · GitHub
Skip to content

Adding Placeholder API Compability internally [WIP] - #1944

Closed
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi
Closed

Adding Placeholder API Compability internally [WIP]#1944
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi

Conversation

@Banbeucmas

Copy link
Copy Markdown
Contributor

Pretty sure I want this to be an enhancement in 2.16.0
Still WIP tho.

Just that the placeholder seem to work flawlessly with PlaceholderAPI 2.8.5 tested

image

image

I hope my pr didn't fucked up lol. Haven't try to merge specific branch yet

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Yep it fucked up

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

A little note:
image

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

As for registering our own placeholder, https://github.com/PlaceholderAPI/Essentials-Expansion is already here, I think it is better to just continue to contribute there rather than putting them internally onto Essentials

@BanbeucmasBanbeucmas mentioned this pull request Apr 1, 2018
@mdcfemdcfe added the type: enhancement Features and feature requests. label Apr 2, 2018
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

mdcfe added 5 commits April 3, 2018 11:23
Not sure if this is necessary - thoughts?
This will need to be manually changed everywhere `tl` is used where placeholders may be expected.
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Nice one.

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plugin.yml might need some work

website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1945
You once said you don't want to add it as sofedepend.
Will we remove this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot about that. Still need to implement handling of PAPI loading after EssentialsX though before we do that.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will leave that part to you then :)

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was aware of this tho

return null;
}

input = input.replaceAll("\\{|\\}", "%");

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some problem that a single { standing alone will become % after that. I don't use regex for a long time. Should we do something about it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/{([A-Za-z0-9_]+)}/g might work.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@md678685 I love IntelliJ
image

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still need to address this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the replacement with that regex would have been "%$1%", since the ()s in the regex capture the placeholder name (bobsplugin_hunger) and the $1 puts it back in the string once replaced.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love how the problem still excist tho. Idk why but seem like Java Regex behaves different than JS


input = input.replaceAll("\\{|\\}", "%");

if (papiEnabled == null) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be here, in case PAPI loads before EssentialsX - in that instance, Essentials won't receive PAPI's PluginEnableEvent.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is also the reason for the null - at the point that the class is loaded, we won't know whether PAPI is enabled, and it also might not be a safe time to check.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that make sense. Let me change that

//The warp function is a wrapper used to teleportPlayer a player to a /warp
@Override
public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception {
UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be in its own PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this change is in this PR but the actual PR is here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I accidentally create the Papi branch out of the original branch of my fork and PR before even realize it.
We will just solve both PR at the same time or if anyone have a better idea.

@mdcfemdcfe mentioned this pull request Jun 14, 2018
6 tasks
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Should we close this in favor of #2041?

@mdcfe

Copy link
Copy Markdown
Member

@Banbeucmas Yes, closing this PR now.

@mdcfemdcfe closed this Aug 19, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: enhancementFeatures and feature requests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Banbeucmas@mdcfe@drtshock
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Adding Placeholder API Compability internally [WIP] by Banbeucmas · Pull Request #1944 · EssentialsX/Essentials · GitHub
Skip to content

Adding Placeholder API Compability internally [WIP] - #1944

Closed
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi
Closed

Adding Placeholder API Compability internally [WIP]#1944
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi

Conversation

@Banbeucmas

Copy link
Copy Markdown
Contributor

Pretty sure I want this to be an enhancement in 2.16.0
Still WIP tho.

Just that the placeholder seem to work flawlessly with PlaceholderAPI 2.8.5 tested

image

image

I hope my pr didn't fucked up lol. Haven't try to merge specific branch yet

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Yep it fucked up

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

A little note:
image

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

As for registering our own placeholder, https://github.com/PlaceholderAPI/Essentials-Expansion is already here, I think it is better to just continue to contribute there rather than putting them internally onto Essentials

@BanbeucmasBanbeucmas mentioned this pull request Apr 1, 2018
@mdcfemdcfe added the type: enhancement Features and feature requests. label Apr 2, 2018
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

mdcfe added 5 commits April 3, 2018 11:23
Not sure if this is necessary - thoughts?
This will need to be manually changed everywhere `tl` is used where placeholders may be expected.
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Nice one.

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plugin.yml might need some work

website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1945
You once said you don't want to add it as sofedepend.
Will we remove this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot about that. Still need to implement handling of PAPI loading after EssentialsX though before we do that.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will leave that part to you then :)

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was aware of this tho

return null;
}

input = input.replaceAll("\\{|\\}", "%");

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some problem that a single { standing alone will become % after that. I don't use regex for a long time. Should we do something about it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/{([A-Za-z0-9_]+)}/g might work.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@md678685 I love IntelliJ
image

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still need to address this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the replacement with that regex would have been "%$1%", since the ()s in the regex capture the placeholder name (bobsplugin_hunger) and the $1 puts it back in the string once replaced.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love how the problem still excist tho. Idk why but seem like Java Regex behaves different than JS


input = input.replaceAll("\\{|\\}", "%");

if (papiEnabled == null) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be here, in case PAPI loads before EssentialsX - in that instance, Essentials won't receive PAPI's PluginEnableEvent.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is also the reason for the null - at the point that the class is loaded, we won't know whether PAPI is enabled, and it also might not be a safe time to check.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that make sense. Let me change that

//The warp function is a wrapper used to teleportPlayer a player to a /warp
@Override
public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception {
UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be in its own PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this change is in this PR but the actual PR is here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I accidentally create the Papi branch out of the original branch of my fork and PR before even realize it.
We will just solve both PR at the same time or if anyone have a better idea.

@mdcfemdcfe mentioned this pull request Jun 14, 2018
6 tasks
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Should we close this in favor of #2041?

@mdcfe

Copy link
Copy Markdown
Member

@Banbeucmas Yes, closing this PR now.

@mdcfemdcfe closed this Aug 19, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: enhancementFeatures and feature requests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

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

Adding Placeholder API Compability internally [WIP] - #1944

Closed
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi
Closed

Adding Placeholder API Compability internally [WIP]#1944
Banbeucmas wants to merge 28 commits into
EssentialsX:2.xfrom
Banbeucmas:papi

Conversation

@Banbeucmas

Copy link
Copy Markdown
Contributor

Pretty sure I want this to be an enhancement in 2.16.0
Still WIP tho.

Just that the placeholder seem to work flawlessly with PlaceholderAPI 2.8.5 tested

image

image

I hope my pr didn't fucked up lol. Haven't try to merge specific branch yet

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Yep it fucked up

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

A little note:
image

@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

As for registering our own placeholder, https://github.com/PlaceholderAPI/Essentials-Expansion is already here, I think it is better to just continue to contribute there rather than putting them internally onto Essentials

@BanbeucmasBanbeucmas mentioned this pull request Apr 1, 2018
@mdcfemdcfe added the type: enhancement Features and feature requests. label Apr 2, 2018
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

mdcfe added 5 commits April 3, 2018 11:23
Not sure if this is necessary - thoughts?
This will need to be manually changed everywhere `tl` is used where placeholders may be expected.
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Nice one.

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plugin.yml might need some work

website: http://tiny.cc/EssentialsCommands
description: Provides an essential, core set of commands for Bukkit.
softdepend: [Vault]
softdepend: [Vault, PlaceholderAPI]

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1945
You once said you don't want to add it as sofedepend.
Will we remove this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot about that. Still need to implement handling of PAPI loading after EssentialsX though before we do that.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will leave that part to you then :)

@BanbeucmasBanbeucmas left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was aware of this tho

return null;
}

input = input.replaceAll("\\{|\\}", "%");

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some problem that a single { standing alone will become % after that. I don't use regex for a long time. Should we do something about it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/{([A-Za-z0-9_]+)}/g might work.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@md678685 I love IntelliJ
image

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still need to address this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the replacement with that regex would have been "%$1%", since the ()s in the regex capture the placeholder name (bobsplugin_hunger) and the $1 puts it back in the string once replaced.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love how the problem still excist tho. Idk why but seem like Java Regex behaves different than JS


input = input.replaceAll("\\{|\\}", "%");

if (papiEnabled == null) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be here, in case PAPI loads before EssentialsX - in that instance, Essentials won't receive PAPI's PluginEnableEvent.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is also the reason for the null - at the point that the class is loaded, we won't know whether PAPI is enabled, and it also might not be a safe time to check.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that make sense. Let me change that

//The warp function is a wrapper used to teleportPlayer a player to a /warp
@Override
public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception {
UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be in its own PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this change is in this PR but the actual PR is here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I accidentally create the Papi branch out of the original branch of my fork and PR before even realize it.
We will just solve both PR at the same time or if anyone have a better idea.

@mdcfemdcfe mentioned this pull request Jun 14, 2018
6 tasks
@Banbeucmas

Copy link
Copy Markdown
ContributorAuthor

Should we close this in favor of #2041?

@mdcfe

Copy link
Copy Markdown
Member

@Banbeucmas Yes, closing this PR now.

@mdcfemdcfe closed this Aug 19, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: enhancementFeatures and feature requests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Banbeucmas@mdcfe@drtshock