diff options
| -rw-r--r-- | src/main/java/de/torui/coflsky/CoflSkyCommand.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/torui/coflsky/network/WSClientWrapper.java | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/main/java/de/torui/coflsky/CoflSkyCommand.java b/src/main/java/de/torui/coflsky/CoflSkyCommand.java index 43826f9..20cfeba 100644 --- a/src/main/java/de/torui/coflsky/CoflSkyCommand.java +++ b/src/main/java/de/torui/coflsky/CoflSkyCommand.java @@ -107,8 +107,8 @@ public class CoflSkyCommand extends CommandBase { Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("Stopping Connection to CoflNet")); CoflSessionManager.DeleteAllCoflSessions(); Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("Deleting CoflNet sessions...")); - CoflSky.Wrapper.startConnection(); - Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("Started the Connection to CoflNet")); + if(CoflSky.Wrapper.startConnection()) + Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("Started the Connection to CoflNet")); } public String StatusMessage() { diff --git a/src/main/java/de/torui/coflsky/network/WSClientWrapper.java b/src/main/java/de/torui/coflsky/network/WSClientWrapper.java index 6542542..044dd65 100644 --- a/src/main/java/de/torui/coflsky/network/WSClientWrapper.java +++ b/src/main/java/de/torui/coflsky/network/WSClientWrapper.java @@ -13,7 +13,11 @@ import de.torui.coflsky.commands.Command; import de.torui.coflsky.commands.JsonStringCommand; import de.torui.coflsky.minecraft_integration.PlayerDataProvider; import net.minecraft.client.Minecraft; +import net.minecraft.event.ClickEvent; +import net.minecraft.event.ClickEvent.Action; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatStyle; +import net.minecraft.util.EnumChatFormatting; import de.torui.coflsky.minecraft_integration.CoflSessionManager; @@ -63,7 +67,19 @@ public class WSClientWrapper { } } - throw new Error("Could not connect to any websocket remote!"); + Minecraft.getMinecraft().thePlayer.addChatMessage( + new ChatComponentText("Cofl could not establish a connection to any server!"+ + "\nIf you think this is a bug. Please report it on our Discord and include the ") + .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)) + .appendSibling(new ChatComponentText("logs!") + .setChatStyle(new ChatStyle() + .setUnderlined(true) + .setColor(EnumChatFormatting.BLUE) + .setChatClickEvent(new ClickEvent(Action.OPEN_URL, "https://www.youtube.com/watch?v=9Kb29wEcMcs"))))); + + return false; + //throw new Error("Could not connect to any websocket remote!"); + } |