From 538e95ad95cccb498c87a3617d1ba3b6a1e9310e Mon Sep 17 00:00:00 2001 From: johni0702 Date: Sun, 24 May 2015 15:18:41 +0200 Subject: [PATCH] Set name of unnamed threads --- .../replaymod/chat/ChatMessageHandler.java | 2 +- .../replaymod/gui/GuiPlayerOverview.java | 2 +- .../replaymod/gui/online/GuiLoginPrompt.java | 2 +- .../replaymod/gui/online/GuiRegister.java | 2 +- .../replaymod/gui/online/GuiReplayCenter.java | 8 ++++---- .../replaymod/gui/online/GuiUploadFile.java | 2 +- .../recording/ConnectionEventHandler.java | 20 +++++++++---------- .../replaymod/recording/DataListener.java | 2 +- .../registry/ReplayFileAppender.java | 2 +- .../replaymod/replay/ReplaySender.java | 4 ++-- .../replaymod/video/ReplayScreenshot.java | 2 +- .../replaymod/video/VideoWriter.java | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java b/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java index be3f75ef..3a1d3934 100755 --- a/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java @@ -52,7 +52,7 @@ public class ChatMessageHandler { } } } - }); + }, "replaymod-chat-message-handler"); public ChatMessageHandler() { t.start(); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java index d1f02132..991efc0f 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java @@ -86,7 +86,7 @@ public class GuiPlayerOverview extends GuiScreen { e.printStackTrace(); } } - }).start(); + }, "replaymod-skin-loader").start(); } playerCount = players.size(); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiLoginPrompt.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiLoginPrompt.java index 98a8d290..f098289b 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiLoginPrompt.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiLoginPrompt.java @@ -114,7 +114,7 @@ public class GuiLoginPrompt extends GuiScreen { break; } } - }).start(); + }, "replaymod-auth").start(); } } else if(button.id == GuiConstants.LOGIN_CANCEL_BUTTON) { mc.displayGuiScreen(parent); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java index e01a2fef..ecca1184 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java @@ -200,7 +200,7 @@ public class GuiRegister extends GuiScreen { message = I18n.format("replaymod.gui.login.connectionerror"); } } - }).start(); + }, "replaymod-register").start(); break; } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java index fde76d3d..9501b4af 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java @@ -390,7 +390,7 @@ public class GuiReplayCenter extends GuiScreen implements GuiYesNoCallback { currentTab = Tab.RECENT_FILES; updateCurrentList(new SearchPagination(recentFileSearchQuery)); } - }); + }, "replaymod-list-loader"); currentListLoader.start(); } @@ -402,7 +402,7 @@ public class GuiReplayCenter extends GuiScreen implements GuiYesNoCallback { currentTab = Tab.BEST_FILES; updateCurrentList(new SearchPagination(bestFileSearchQuery)); } - }); + }, "replaymod-list-loader"); currentListLoader.start(); } @@ -414,7 +414,7 @@ public class GuiReplayCenter extends GuiScreen implements GuiYesNoCallback { currentTab = Tab.DOWNLOADED_FILES; updateCurrentList(new DownloadedFilePagination()); } - }); + }, "replaymod-list-loader"); currentListLoader.start(); } @@ -427,7 +427,7 @@ public class GuiReplayCenter extends GuiScreen implements GuiYesNoCallback { ReplayMod.favoritedFileHandler.reloadFavorites(); updateCurrentList(new FavoritedFilePagination()); } - }); + }, "replaymod-list-loader"); currentListLoader.start(); } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java index a32efe14..6c52f77e 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java @@ -241,7 +241,7 @@ public class GuiUploadFile extends GuiScreen { e.printStackTrace(); } } - }).start(); + }, "replaymod-file-uploader").start(); } else if(button.id == GuiConstants.UPLOAD_CANCEL_BUTTON) { uploader.cancelUploading(); } diff --git a/src/main/java/eu/crushedpixel/replaymod/recording/ConnectionEventHandler.java b/src/main/java/eu/crushedpixel/replaymod/recording/ConnectionEventHandler.java index 8e3ee450..dceaf60d 100755 --- a/src/main/java/eu/crushedpixel/replaymod/recording/ConnectionEventHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/recording/ConnectionEventHandler.java @@ -109,23 +109,23 @@ public class ConnectionEventHandler { @Override public void run() { String worldName = null; - while(worldName == null) { - try { + while (true) { + if (MinecraftServer.getServer() != null) { worldName = MinecraftServer.getServer().getWorldName(); - listener.setWorldName(worldName); - return; - - } catch(Exception e) { + } + if (worldName == null) { try { Thread.sleep(100); - } catch(InterruptedException e1) { - e1.printStackTrace(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); } + } else { + listener.setWorldName(worldName); + return; } } - } - }).start(); + }, "replaymod-world-name-fetcher").start(); } packetListener = listener; diff --git a/src/main/java/eu/crushedpixel/replaymod/recording/DataListener.java b/src/main/java/eu/crushedpixel/replaymod/recording/DataListener.java index 06b80519..26996c47 100755 --- a/src/main/java/eu/crushedpixel/replaymod/recording/DataListener.java +++ b/src/main/java/eu/crushedpixel/replaymod/recording/DataListener.java @@ -105,7 +105,7 @@ public abstract class DataListener extends ChannelInboundHandlerAdapter { } } - }); + }, "replaymod-packet-writer"); public DataWriter(DataOutputStream stream) { this.stream = stream; diff --git a/src/main/java/eu/crushedpixel/replaymod/registry/ReplayFileAppender.java b/src/main/java/eu/crushedpixel/replaymod/registry/ReplayFileAppender.java index e3590029..ad52bafe 100644 --- a/src/main/java/eu/crushedpixel/replaymod/registry/ReplayFileAppender.java +++ b/src/main/java/eu/crushedpixel/replaymod/registry/ReplayFileAppender.java @@ -19,7 +19,7 @@ public class ReplayFileAppender extends Thread { public void run() { ReplayFileAppender.this.shutdown(); } - })); + }, "replaymod-file-appender-shutdown")); } public void registerModifiedFile(File toAdd, String name, File replayFile) { diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java index 75eeb0f3..c537d5b5 100755 --- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java +++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java @@ -155,7 +155,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter { this.replayLength = file.metadata().get().getDuration(); if (asyncMode) { - new Thread(asyncSender).start(); + new Thread(asyncSender, "replaymod-async-sender").start(); } } @@ -170,7 +170,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter { this.asyncMode = asyncMode; if (asyncMode) { this.terminate = false; - new Thread(asyncSender).start(); + new Thread(asyncSender, "replaymod-async-sender").start(); } else { this.terminate = true; } diff --git a/src/main/java/eu/crushedpixel/replaymod/video/ReplayScreenshot.java b/src/main/java/eu/crushedpixel/replaymod/video/ReplayScreenshot.java index ee960c66..1d61c7da 100755 --- a/src/main/java/eu/crushedpixel/replaymod/video/ReplayScreenshot.java +++ b/src/main/java/eu/crushedpixel/replaymod/video/ReplayScreenshot.java @@ -96,7 +96,7 @@ public class ReplayScreenshot { TickAndRenderListener.finishScreenshot(); } } - }); + }, "replaymod-screenshot-saver"); ioThread.start(); } catch(Exception exception) { diff --git a/src/main/java/eu/crushedpixel/replaymod/video/VideoWriter.java b/src/main/java/eu/crushedpixel/replaymod/video/VideoWriter.java index bc6d599c..59ba0894 100755 --- a/src/main/java/eu/crushedpixel/replaymod/video/VideoWriter.java +++ b/src/main/java/eu/crushedpixel/replaymod/video/VideoWriter.java @@ -110,7 +110,7 @@ public class VideoWriter { e.printStackTrace(); } } - }); + }, "replaymod-video-writer"); writerThread.start(); }