Skip to content

Shutdown executors on disable#6565

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

Merged
mdcfe merged 1 commit into from
Jun 14, 2026
+54 −4
Merged

Shutdown executors on disable #6565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/Essentials.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
import com.earth2me.essentials.updatecheck.UpdateChecker;
import com.earth2me.essentials.userstorage.ModernUserMap;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.PasteUtil;
import com.earth2me.essentials.utils.VersionUtil;
import io.papermc.lib.PaperLib;
import net.ess3.api.Economy;
Expand DownExpand Up@@ -587,6 +588,8 @@ public void onDisable() {
getUsers().shutdown();

EssentialsConfiguration.shutdownExecutor();
PasteUtil.shutdownExecutor();
getServer().getScheduler().cancelTasks(this);

HandlerList.unregisterAll(this);
}
Expand Down
28 changes: 26 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/I18n.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,14 +28,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.regex.Pattern;

public class I18n implements net.ess3.api.II18n {
private static final String MESSAGES = "messages";
private static final Pattern NODOUBLEMARK = Pattern.compile("''");
private static final ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
private static volatile ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
private static final ResourceBundle NULL_BUNDLE = new ResourceBundle() {
@SuppressWarnings("NullableProblems")
public Enumeration<String> getKeys() {
Expand DownExpand Up@@ -106,6 +107,29 @@ public void onEnable() {

public void onDisable() {
instance = null;
shutdownExecutor();
}

private static synchronized ExecutorService getExecutor() {
if (BUNDLE_LOADER_EXECUTOR == null || BUNDLE_LOADER_EXECUTOR.isShutdown() || BUNDLE_LOADER_EXECUTOR.isTerminated()) {
BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
}
return BUNDLE_LOADER_EXECUTOR;
}

private static synchronized void shutdownExecutor() {
final ExecutorService exec = BUNDLE_LOADER_EXECUTOR;
if (exec == null) {
return;
}
exec.shutdown();
try {
if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
exec.shutdownNow();
}
} catch (final InterruptedException ignored) {
exec.shutdownNow();
}
}

@Override
Expand All@@ -124,7 +148,7 @@ private ResourceBundle getBundle(final Locale locale) {
synchronized (loadingBundles) {
if (!loadingBundles.contains(locale)) {
loadingBundles.add(locale);
BUNDLE_LOADER_EXECUTOR.submit(() -> {
getExecutor().submit(() -> {
blockingLoadBundle(locale);
synchronized (loadingBundles) {
loadingBundles.remove(locale);
Expand Down
27 changes: 25 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/utils/PasteUtil.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,13 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;

public final class PasteUtil {
private static final String PASTE_URL = "https://pastes.dev/";
private static final String PASTE_UPLOAD_URL = "https://api.pastes.dev/post";
private static final ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
private static volatile ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
private static final Gson GSON = new Gson();

private PasteUtil() {
Expand All@@ -35,7 +36,7 @@ private PasteUtil() {
*/
public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages) {
final CompletableFuture<PasteResult> future = new CompletableFuture<>();
PASTE_EXECUTOR_SERVICE.submit(() -> {
getExecutor().submit(() -> {
try {
final HttpURLConnection connection = (HttpURLConnection) new URL(PASTE_UPLOAD_URL).openConnection();
connection.setRequestMethod("POST");
Expand DownExpand Up@@ -81,6 +82,28 @@ public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages)
return future;
}

private static synchronized ExecutorService getExecutor() {
if (PASTE_EXECUTOR_SERVICE == null || PASTE_EXECUTOR_SERVICE.isShutdown() || PASTE_EXECUTOR_SERVICE.isTerminated()) {
PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
}
return PASTE_EXECUTOR_SERVICE;
}

public static synchronized void shutdownExecutor() {
final ExecutorService exec = PASTE_EXECUTOR_SERVICE;
if (exec == null) {
return;
}
exec.shutdown();
try {
if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
exec.shutdownNow();
}
} catch (final InterruptedException ignored) {
exec.shutdownNow();
}
}

public static class PasteFile {
private final String name;
private final String contents;
Expand Down
Loading
, '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" + '
Shutdown executors on disable by JRoy · Pull Request #6565 · EssentialsX/Essentials · GitHub
Skip to content
Shutdown executors on disable#6565

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

 Merged

mdcfe
merged 1 commit into

from

Jun 14, 2026

+54

−4

 Merged


Shutdown executors on disable
#6565
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 3 additions & 0 deletions
Essentials/src/main/java/com/earth2me/essentials/Essentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
import com.earth2me.essentials.updatecheck.UpdateChecker;
import com.earth2me.essentials.userstorage.ModernUserMap;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.PasteUtil;
import com.earth2me.essentials.utils.VersionUtil;
import io.papermc.lib.PaperLib;
import net.ess3.api.Economy;
Expand DownExpand Up@@ -587,6 +588,8 @@ public void onDisable() {
 getUsers().shutdown();

 EssentialsConfiguration.shutdownExecutor();
 PasteUtil.shutdownExecutor();
 getServer().getScheduler().cancelTasks(this);

 HandlerList.unregisterAll(this);
 }
Expand Down

28 changes: 26 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/I18n.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,14 +28,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.regex.Pattern;

public class I18n implements net.ess3.api.II18n {
 private static final String MESSAGES = "messages";
 private static final Pattern NODOUBLEMARK = Pattern.compile("''");
 private static final ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static volatile ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static final ResourceBundle NULL_BUNDLE = new ResourceBundle() {
 @SuppressWarnings("NullableProblems")
 public Enumeration<String> getKeys() {
Expand DownExpand Up@@ -106,6 +107,29 @@ public void onEnable() {

 public void onDisable() {
 instance = null;
 shutdownExecutor();
 }

 private static synchronized ExecutorService getExecutor() {
 if (BUNDLE_LOADER_EXECUTOR == null || BUNDLE_LOADER_EXECUTOR.isShutdown() || BUNDLE_LOADER_EXECUTOR.isTerminated()) {
 BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 }
 return BUNDLE_LOADER_EXECUTOR;
 }

 private static synchronized void shutdownExecutor() {
 final ExecutorService exec = BUNDLE_LOADER_EXECUTOR;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 @Override
Expand All@@ -124,7 +148,7 @@ private ResourceBundle getBundle(final Locale locale) {
 synchronized (loadingBundles) {
 if (!loadingBundles.contains(locale)) {
 loadingBundles.add(locale);
BUNDLE_LOADER_EXECUTOR.submit(() -> {
getExecutor().submit(() -> {
 blockingLoadBundle(locale);
 synchronized (loadingBundles) {
 loadingBundles.remove(locale);
Expand Down

27 changes: 25 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/utils/PasteUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,13 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;

public final class PasteUtil {
 private static final String PASTE_URL = "https://pastes.dev/";
 private static final String PASTE_UPLOAD_URL = "https://api.pastes.dev/post";
 private static final ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static volatile ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static final Gson GSON = new Gson();

 private PasteUtil() {
Expand All@@ -35,7 +36,7 @@ private PasteUtil() {
 */
 public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages) {
 final CompletableFuture<PasteResult> future = new CompletableFuture<>();
PASTE_EXECUTOR_SERVICE.submit(() -> {
getExecutor().submit(() -> {
 try {
 final HttpURLConnection connection = (HttpURLConnection) new URL(PASTE_UPLOAD_URL).openConnection();
 connection.setRequestMethod("POST");
Expand DownExpand Up@@ -81,6 +82,28 @@ public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages)
 return future;
 }

 private static synchronized ExecutorService getExecutor() {
 if (PASTE_EXECUTOR_SERVICE == null || PASTE_EXECUTOR_SERVICE.isShutdown() || PASTE_EXECUTOR_SERVICE.isTerminated()) {
 PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 }
 return PASTE_EXECUTOR_SERVICE;
 }

 public static synchronized void shutdownExecutor() {
 final ExecutorService exec = PASTE_EXECUTOR_SERVICE;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 public static class PasteFile {
 private final String name;
 private final String contents;
Expand Down
Loading

, '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('^' + ".*" + '
Shutdown executors on disable by JRoy · Pull Request #6565 · EssentialsX/Essentials · GitHub
Skip to content
Shutdown executors on disable#6565

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

 Merged

mdcfe
merged 1 commit into

from

Jun 14, 2026

+54

−4

 Merged


Shutdown executors on disable
#6565
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 3 additions & 0 deletions
Essentials/src/main/java/com/earth2me/essentials/Essentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
import com.earth2me.essentials.updatecheck.UpdateChecker;
import com.earth2me.essentials.userstorage.ModernUserMap;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.PasteUtil;
import com.earth2me.essentials.utils.VersionUtil;
import io.papermc.lib.PaperLib;
import net.ess3.api.Economy;
Expand DownExpand Up@@ -587,6 +588,8 @@ public void onDisable() {
 getUsers().shutdown();

 EssentialsConfiguration.shutdownExecutor();
 PasteUtil.shutdownExecutor();
 getServer().getScheduler().cancelTasks(this);

 HandlerList.unregisterAll(this);
 }
Expand Down

28 changes: 26 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/I18n.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,14 +28,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.regex.Pattern;

public class I18n implements net.ess3.api.II18n {
 private static final String MESSAGES = "messages";
 private static final Pattern NODOUBLEMARK = Pattern.compile("''");
 private static final ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static volatile ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static final ResourceBundle NULL_BUNDLE = new ResourceBundle() {
 @SuppressWarnings("NullableProblems")
 public Enumeration<String> getKeys() {
Expand DownExpand Up@@ -106,6 +107,29 @@ public void onEnable() {

 public void onDisable() {
 instance = null;
 shutdownExecutor();
 }

 private static synchronized ExecutorService getExecutor() {
 if (BUNDLE_LOADER_EXECUTOR == null || BUNDLE_LOADER_EXECUTOR.isShutdown() || BUNDLE_LOADER_EXECUTOR.isTerminated()) {
 BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 }
 return BUNDLE_LOADER_EXECUTOR;
 }

 private static synchronized void shutdownExecutor() {
 final ExecutorService exec = BUNDLE_LOADER_EXECUTOR;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 @Override
Expand All@@ -124,7 +148,7 @@ private ResourceBundle getBundle(final Locale locale) {
 synchronized (loadingBundles) {
 if (!loadingBundles.contains(locale)) {
 loadingBundles.add(locale);
BUNDLE_LOADER_EXECUTOR.submit(() -> {
getExecutor().submit(() -> {
 blockingLoadBundle(locale);
 synchronized (loadingBundles) {
 loadingBundles.remove(locale);
Expand Down

27 changes: 25 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/utils/PasteUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,13 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;

public final class PasteUtil {
 private static final String PASTE_URL = "https://pastes.dev/";
 private static final String PASTE_UPLOAD_URL = "https://api.pastes.dev/post";
 private static final ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static volatile ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static final Gson GSON = new Gson();

 private PasteUtil() {
Expand All@@ -35,7 +36,7 @@ private PasteUtil() {
 */
 public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages) {
 final CompletableFuture<PasteResult> future = new CompletableFuture<>();
PASTE_EXECUTOR_SERVICE.submit(() -> {
getExecutor().submit(() -> {
 try {
 final HttpURLConnection connection = (HttpURLConnection) new URL(PASTE_UPLOAD_URL).openConnection();
 connection.setRequestMethod("POST");
Expand DownExpand Up@@ -81,6 +82,28 @@ public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages)
 return future;
 }

 private static synchronized ExecutorService getExecutor() {
 if (PASTE_EXECUTOR_SERVICE == null || PASTE_EXECUTOR_SERVICE.isShutdown() || PASTE_EXECUTOR_SERVICE.isTerminated()) {
 PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 }
 return PASTE_EXECUTOR_SERVICE;
 }

 public static synchronized void shutdownExecutor() {
 final ExecutorService exec = PASTE_EXECUTOR_SERVICE;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 public static class PasteFile {
 private final String name;
 private final String contents;
Expand Down
Loading

, '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('^' + ".*" + '
Shutdown executors on disable by JRoy · Pull Request #6565 · EssentialsX/Essentials · GitHub
Skip to content
Shutdown executors on disable#6565

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

 Merged

mdcfe
merged 1 commit into

from

Jun 14, 2026

+54

−4

 Merged


Shutdown executors on disable
#6565
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 3 additions & 0 deletions
Essentials/src/main/java/com/earth2me/essentials/Essentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
import com.earth2me.essentials.updatecheck.UpdateChecker;
import com.earth2me.essentials.userstorage.ModernUserMap;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.PasteUtil;
import com.earth2me.essentials.utils.VersionUtil;
import io.papermc.lib.PaperLib;
import net.ess3.api.Economy;
Expand DownExpand Up@@ -587,6 +588,8 @@ public void onDisable() {
 getUsers().shutdown();

 EssentialsConfiguration.shutdownExecutor();
 PasteUtil.shutdownExecutor();
 getServer().getScheduler().cancelTasks(this);

 HandlerList.unregisterAll(this);
 }
Expand Down

28 changes: 26 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/I18n.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,14 +28,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.regex.Pattern;

public class I18n implements net.ess3.api.II18n {
 private static final String MESSAGES = "messages";
 private static final Pattern NODOUBLEMARK = Pattern.compile("''");
 private static final ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static volatile ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static final ResourceBundle NULL_BUNDLE = new ResourceBundle() {
 @SuppressWarnings("NullableProblems")
 public Enumeration<String> getKeys() {
Expand DownExpand Up@@ -106,6 +107,29 @@ public void onEnable() {

 public void onDisable() {
 instance = null;
 shutdownExecutor();
 }

 private static synchronized ExecutorService getExecutor() {
 if (BUNDLE_LOADER_EXECUTOR == null || BUNDLE_LOADER_EXECUTOR.isShutdown() || BUNDLE_LOADER_EXECUTOR.isTerminated()) {
 BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 }
 return BUNDLE_LOADER_EXECUTOR;
 }

 private static synchronized void shutdownExecutor() {
 final ExecutorService exec = BUNDLE_LOADER_EXECUTOR;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 @Override
Expand All@@ -124,7 +148,7 @@ private ResourceBundle getBundle(final Locale locale) {
 synchronized (loadingBundles) {
 if (!loadingBundles.contains(locale)) {
 loadingBundles.add(locale);
BUNDLE_LOADER_EXECUTOR.submit(() -> {
getExecutor().submit(() -> {
 blockingLoadBundle(locale);
 synchronized (loadingBundles) {
 loadingBundles.remove(locale);
Expand Down

27 changes: 25 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/utils/PasteUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,13 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;

public final class PasteUtil {
 private static final String PASTE_URL = "https://pastes.dev/";
 private static final String PASTE_UPLOAD_URL = "https://api.pastes.dev/post";
 private static final ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static volatile ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static final Gson GSON = new Gson();

 private PasteUtil() {
Expand All@@ -35,7 +36,7 @@ private PasteUtil() {
 */
 public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages) {
 final CompletableFuture<PasteResult> future = new CompletableFuture<>();
PASTE_EXECUTOR_SERVICE.submit(() -> {
getExecutor().submit(() -> {
 try {
 final HttpURLConnection connection = (HttpURLConnection) new URL(PASTE_UPLOAD_URL).openConnection();
 connection.setRequestMethod("POST");
Expand DownExpand Up@@ -81,6 +82,28 @@ public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages)
 return future;
 }

 private static synchronized ExecutorService getExecutor() {
 if (PASTE_EXECUTOR_SERVICE == null || PASTE_EXECUTOR_SERVICE.isShutdown() || PASTE_EXECUTOR_SERVICE.isTerminated()) {
 PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 }
 return PASTE_EXECUTOR_SERVICE;
 }

 public static synchronized void shutdownExecutor() {
 final ExecutorService exec = PASTE_EXECUTOR_SERVICE;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 public static class PasteFile {
 private final String name;
 private final String contents;
Expand Down
Loading

, '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" + '
Shutdown executors on disable by JRoy · Pull Request #6565 · EssentialsX/Essentials · GitHub
Skip to content
Shutdown executors on disable#6565

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

 Merged

mdcfe
merged 1 commit into

from

Jun 14, 2026

+54

−4

 Merged


Shutdown executors on disable
#6565
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 3 additions & 0 deletions
Essentials/src/main/java/com/earth2me/essentials/Essentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
import com.earth2me.essentials.updatecheck.UpdateChecker;
import com.earth2me.essentials.userstorage.ModernUserMap;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.PasteUtil;
import com.earth2me.essentials.utils.VersionUtil;
import io.papermc.lib.PaperLib;
import net.ess3.api.Economy;
Expand DownExpand Up@@ -587,6 +588,8 @@ public void onDisable() {
 getUsers().shutdown();

 EssentialsConfiguration.shutdownExecutor();
 PasteUtil.shutdownExecutor();
 getServer().getScheduler().cancelTasks(this);

 HandlerList.unregisterAll(this);
 }
Expand Down

28 changes: 26 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/I18n.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,14 +28,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.regex.Pattern;

public class I18n implements net.ess3.api.II18n {
 private static final String MESSAGES = "messages";
 private static final Pattern NODOUBLEMARK = Pattern.compile("''");
 private static final ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static volatile ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static final ResourceBundle NULL_BUNDLE = new ResourceBundle() {
 @SuppressWarnings("NullableProblems")
 public Enumeration<String> getKeys() {
Expand DownExpand Up@@ -106,6 +107,29 @@ public void onEnable() {

 public void onDisable() {
 instance = null;
 shutdownExecutor();
 }

 private static synchronized ExecutorService getExecutor() {
 if (BUNDLE_LOADER_EXECUTOR == null || BUNDLE_LOADER_EXECUTOR.isShutdown() || BUNDLE_LOADER_EXECUTOR.isTerminated()) {
 BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 }
 return BUNDLE_LOADER_EXECUTOR;
 }

 private static synchronized void shutdownExecutor() {
 final ExecutorService exec = BUNDLE_LOADER_EXECUTOR;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 @Override
Expand All@@ -124,7 +148,7 @@ private ResourceBundle getBundle(final Locale locale) {
 synchronized (loadingBundles) {
 if (!loadingBundles.contains(locale)) {
 loadingBundles.add(locale);
BUNDLE_LOADER_EXECUTOR.submit(() -> {
getExecutor().submit(() -> {
 blockingLoadBundle(locale);
 synchronized (loadingBundles) {
 loadingBundles.remove(locale);
Expand Down

27 changes: 25 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/utils/PasteUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,13 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;

public final class PasteUtil {
 private static final String PASTE_URL = "https://pastes.dev/";
 private static final String PASTE_UPLOAD_URL = "https://api.pastes.dev/post";
 private static final ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static volatile ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static final Gson GSON = new Gson();

 private PasteUtil() {
Expand All@@ -35,7 +36,7 @@ private PasteUtil() {
 */
 public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages) {
 final CompletableFuture<PasteResult> future = new CompletableFuture<>();
PASTE_EXECUTOR_SERVICE.submit(() -> {
getExecutor().submit(() -> {
 try {
 final HttpURLConnection connection = (HttpURLConnection) new URL(PASTE_UPLOAD_URL).openConnection();
 connection.setRequestMethod("POST");
Expand DownExpand Up@@ -81,6 +82,28 @@ public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages)
 return future;
 }

 private static synchronized ExecutorService getExecutor() {
 if (PASTE_EXECUTOR_SERVICE == null || PASTE_EXECUTOR_SERVICE.isShutdown() || PASTE_EXECUTOR_SERVICE.isTerminated()) {
 PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 }
 return PASTE_EXECUTOR_SERVICE;
 }

 public static synchronized void shutdownExecutor() {
 final ExecutorService exec = PASTE_EXECUTOR_SERVICE;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 public static class PasteFile {
 private final String name;
 private final String contents;
Expand Down
Loading

, '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('^' + ".*" + '
Shutdown executors on disable by JRoy · Pull Request #6565 · EssentialsX/Essentials · GitHub
Skip to content
Shutdown executors on disable#6565

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

 Merged

mdcfe
merged 1 commit into

from

Jun 14, 2026

+54

−4

 Merged


Shutdown executors on disable
#6565
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 3 additions & 0 deletions
Essentials/src/main/java/com/earth2me/essentials/Essentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
import com.earth2me.essentials.updatecheck.UpdateChecker;
import com.earth2me.essentials.userstorage.ModernUserMap;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.PasteUtil;
import com.earth2me.essentials.utils.VersionUtil;
import io.papermc.lib.PaperLib;
import net.ess3.api.Economy;
Expand DownExpand Up@@ -587,6 +588,8 @@ public void onDisable() {
 getUsers().shutdown();

 EssentialsConfiguration.shutdownExecutor();
 PasteUtil.shutdownExecutor();
 getServer().getScheduler().cancelTasks(this);

 HandlerList.unregisterAll(this);
 }
Expand Down

28 changes: 26 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/I18n.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,14 +28,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.regex.Pattern;

public class I18n implements net.ess3.api.II18n {
 private static final String MESSAGES = "messages";
 private static final Pattern NODOUBLEMARK = Pattern.compile("''");
 private static final ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static volatile ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static final ResourceBundle NULL_BUNDLE = new ResourceBundle() {
 @SuppressWarnings("NullableProblems")
 public Enumeration<String> getKeys() {
Expand DownExpand Up@@ -106,6 +107,29 @@ public void onEnable() {

 public void onDisable() {
 instance = null;
 shutdownExecutor();
 }

 private static synchronized ExecutorService getExecutor() {
 if (BUNDLE_LOADER_EXECUTOR == null || BUNDLE_LOADER_EXECUTOR.isShutdown() || BUNDLE_LOADER_EXECUTOR.isTerminated()) {
 BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 }
 return BUNDLE_LOADER_EXECUTOR;
 }

 private static synchronized void shutdownExecutor() {
 final ExecutorService exec = BUNDLE_LOADER_EXECUTOR;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 @Override
Expand All@@ -124,7 +148,7 @@ private ResourceBundle getBundle(final Locale locale) {
 synchronized (loadingBundles) {
 if (!loadingBundles.contains(locale)) {
 loadingBundles.add(locale);
BUNDLE_LOADER_EXECUTOR.submit(() -> {
getExecutor().submit(() -> {
 blockingLoadBundle(locale);
 synchronized (loadingBundles) {
 loadingBundles.remove(locale);
Expand Down

27 changes: 25 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/utils/PasteUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,13 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;

public final class PasteUtil {
 private static final String PASTE_URL = "https://pastes.dev/";
 private static final String PASTE_UPLOAD_URL = "https://api.pastes.dev/post";
 private static final ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static volatile ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static final Gson GSON = new Gson();

 private PasteUtil() {
Expand All@@ -35,7 +36,7 @@ private PasteUtil() {
 */
 public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages) {
 final CompletableFuture<PasteResult> future = new CompletableFuture<>();
PASTE_EXECUTOR_SERVICE.submit(() -> {
getExecutor().submit(() -> {
 try {
 final HttpURLConnection connection = (HttpURLConnection) new URL(PASTE_UPLOAD_URL).openConnection();
 connection.setRequestMethod("POST");
Expand DownExpand Up@@ -81,6 +82,28 @@ public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages)
 return future;
 }

 private static synchronized ExecutorService getExecutor() {
 if (PASTE_EXECUTOR_SERVICE == null || PASTE_EXECUTOR_SERVICE.isShutdown() || PASTE_EXECUTOR_SERVICE.isTerminated()) {
 PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 }
 return PASTE_EXECUTOR_SERVICE;
 }

 public static synchronized void shutdownExecutor() {
 final ExecutorService exec = PASTE_EXECUTOR_SERVICE;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 public static class PasteFile {
 private final String name;
 private final String contents;
Expand Down
Loading

, '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); }
})();
})();
Shutdown executors on disable by JRoy · Pull Request #6565 · EssentialsX/Essentials · GitHub
Skip to content
Shutdown executors on disable#6565

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

 Merged

mdcfe
merged 1 commit into

from

Jun 14, 2026

+54

−4

 Merged


Shutdown executors on disable
#6565
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 3 additions & 0 deletions
Essentials/src/main/java/com/earth2me/essentials/Essentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
import com.earth2me.essentials.updatecheck.UpdateChecker;
import com.earth2me.essentials.userstorage.ModernUserMap;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.PasteUtil;
import com.earth2me.essentials.utils.VersionUtil;
import io.papermc.lib.PaperLib;
import net.ess3.api.Economy;
Expand DownExpand Up@@ -587,6 +588,8 @@ public void onDisable() {
 getUsers().shutdown();

 EssentialsConfiguration.shutdownExecutor();
 PasteUtil.shutdownExecutor();
 getServer().getScheduler().cancelTasks(this);

 HandlerList.unregisterAll(this);
 }
Expand Down

28 changes: 26 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/I18n.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,14 +28,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.regex.Pattern;

public class I18n implements net.ess3.api.II18n {
 private static final String MESSAGES = "messages";
 private static final Pattern NODOUBLEMARK = Pattern.compile("''");
 private static final ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static volatile ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 private static final ResourceBundle NULL_BUNDLE = new ResourceBundle() {
 @SuppressWarnings("NullableProblems")
 public Enumeration<String> getKeys() {
Expand DownExpand Up@@ -106,6 +107,29 @@ public void onEnable() {

 public void onDisable() {
 instance = null;
 shutdownExecutor();
 }

 private static synchronized ExecutorService getExecutor() {
 if (BUNDLE_LOADER_EXECUTOR == null || BUNDLE_LOADER_EXECUTOR.isShutdown() || BUNDLE_LOADER_EXECUTOR.isTerminated()) {
 BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
 }
 return BUNDLE_LOADER_EXECUTOR;
 }

 private static synchronized void shutdownExecutor() {
 final ExecutorService exec = BUNDLE_LOADER_EXECUTOR;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 @Override
Expand All@@ -124,7 +148,7 @@ private ResourceBundle getBundle(final Locale locale) {
 synchronized (loadingBundles) {
 if (!loadingBundles.contains(locale)) {
 loadingBundles.add(locale);
BUNDLE_LOADER_EXECUTOR.submit(() -> {
getExecutor().submit(() -> {
 blockingLoadBundle(locale);
 synchronized (loadingBundles) {
 loadingBundles.remove(locale);
Expand Down

27 changes: 25 additions & 2 deletions
Essentials/src/main/java/com/earth2me/essentials/utils/PasteUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,13 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;

public final class PasteUtil {
 private static final String PASTE_URL = "https://pastes.dev/";
 private static final String PASTE_UPLOAD_URL = "https://api.pastes.dev/post";
 private static final ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static volatile ExecutorService PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 private static final Gson GSON = new Gson();

 private PasteUtil() {
Expand All@@ -35,7 +36,7 @@ private PasteUtil() {
 */
 public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages) {
 final CompletableFuture<PasteResult> future = new CompletableFuture<>();
PASTE_EXECUTOR_SERVICE.submit(() -> {
getExecutor().submit(() -> {
 try {
 final HttpURLConnection connection = (HttpURLConnection) new URL(PASTE_UPLOAD_URL).openConnection();
 connection.setRequestMethod("POST");
Expand DownExpand Up@@ -81,6 +82,28 @@ public static CompletableFuture<PasteResult> createPaste(List<PasteFile> pages)
 return future;
 }

 private static synchronized ExecutorService getExecutor() {
 if (PASTE_EXECUTOR_SERVICE == null || PASTE_EXECUTOR_SERVICE.isShutdown() || PASTE_EXECUTOR_SERVICE.isTerminated()) {
 PASTE_EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
 }
 return PASTE_EXECUTOR_SERVICE;
 }

 public static synchronized void shutdownExecutor() {
 final ExecutorService exec = PASTE_EXECUTOR_SERVICE;
 if (exec == null) {
 return;
 }
 exec.shutdown();
 try {
 if (!exec.awaitTermination(5, TimeUnit.SECONDS)) {
 exec.shutdownNow();
 }
 } catch (final InterruptedException ignored) {
 exec.shutdownNow();
 }
 }

 public static class PasteFile {
 private final String name;
 private final String contents;
Expand Down
Loading