diff options
38 files changed, 479 insertions, 28 deletions
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java index fb6acadf..6ea7bbfa 100755 --- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java @@ -23,6 +23,8 @@ import kr.syeyoung.dungeonsguide.launcher.branch.UpdateRetrieverUtil; import kr.syeyoung.dungeonsguide.launcher.exceptions.*; import kr.syeyoung.dungeonsguide.launcher.gui.screen.GuiDisplayer; import kr.syeyoung.dungeonsguide.launcher.gui.screen.WidgetError; +import kr.syeyoung.dungeonsguide.launcher.gui.screen.WidgetPrivacyPolicy; +import kr.syeyoung.dungeonsguide.launcher.gui.screen.WidgetPrivacyPolicyLocal; import kr.syeyoung.dungeonsguide.launcher.gui.screen.version.WidgetChooseVersion; import kr.syeyoung.dungeonsguide.launcher.gui.tooltip.Notification; import kr.syeyoung.dungeonsguide.launcher.gui.tooltip.NotificationManager; @@ -332,6 +334,15 @@ public class Main if (dgInterface != null) dgInterface.onResourceReload(a); DefaultFontRenderer.DEFAULT_RENDERER.onResourceManagerReload(); }); +// UUID uid = UUID.randomUUID(); +// NotificationManager.getInstance().updateNotification(uid, new WidgetNotification(uid, Notification.builder() +// .title("Privacy Policy") +// .description("Please accept Dungeons Guide\nPrivacy Policy to enjoy server based\nfeatures of Dungeons Guide\n\n(Including Auto-Update/Remote-Jar)") +// .titleColor(0xFFFF0000) +// .onClick(() -> { +// GuiDisplayer.INSTANCE.displayGui(new GuiScreenAdapter(new GlobalHUDScale(new WidgetPrivacyPolicyLocal()))); +// }) +// .build())); } public static Main getMain() { diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/screen/WidgetPrivacyPolicyLocal.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/screen/WidgetPrivacyPolicyLocal.java new file mode 100644 index 00000000..eb5eca2f --- /dev/null +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/screen/WidgetPrivacyPolicyLocal.java @@ -0,0 +1,94 @@ +/* + * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod + * Copyright (C) 2023 cyoung06 (syeyoung) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +package kr.syeyoung.dungeonsguide.launcher.gui.screen; + +import kr.syeyoung.dungeonsguide.launcher.LetsEncrypt; +import kr.syeyoung.dungeonsguide.launcher.LoaderMeta; +import kr.syeyoung.dungeonsguide.launcher.Main; +import kr.syeyoung.dungeonsguide.launcher.auth.AuthManager; +import kr.syeyoung.dungeonsguide.launcher.guiv2.BindableAttribute; +import kr.syeyoung.dungeonsguide.launcher.guiv2.Widget; +import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.AnnotatedImportOnlyWidget; +import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.DomElementRegistry; +import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.ParsedWidgetConverter; +import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Bind; +import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.On; +import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.data.ParserElement; +import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.data.W3CBackedParser; +import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.util.ResourceLocation; + +import javax.net.ssl.HttpsURLConnection; +import java.net.URL; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +public class WidgetPrivacyPolicyLocal extends AnnotatedImportOnlyWidget { + public static final ExecutorService executor = Executors.newSingleThreadExecutor(); + @Bind(variableName = "policy") + public final BindableAttribute<Widget> policy = new BindableAttribute<>(Widget.class); + @Bind(variableName = "policyVisibility") + public final BindableAttribute<String> policyVisibility = new BindableAttribute<>(String.class, "loading"); + + @Bind(variableName = "policyVersion") + public final BindableAttribute<Integer> version = new BindableAttribute<>(Integer.class, 0); + + public WidgetPrivacyPolicyLocal() { + super(new ResourceLocation("dungeons_guide_loader:gui/privacyPolicy/privacyPolicy.gui")); + reload0(); + } + + @On(functionName = "accept") + public void accept() { + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F)); + AuthManager.getInstance().acceptPrivacyPolicy(version.getValue()); + Minecraft.getMinecraft().displayGuiScreen(null); + } + @On(functionName = "deny") + public void deny() { + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F)); + Minecraft.getMinecraft().displayGuiScreen(null); + } + + + public void reload0() { + policyVisibility.setValue("loading"); + executor.submit(() -> { + try { + + try (W3CBackedParser parser = new W3CBackedParser(WidgetPrivacyPolicyLocal.class.getResourceAsStream("/privacyPolicyTest.gui"))) { + ParserElement element = parser.getRootNode(); + ParsedWidgetConverter converter = DomElementRegistry.obtainConverter(element.getNodeName()); + Widget w = converter.convert(this, element); + policy.setValue(w); + policyVisibility.setValue("loaded"); + } + } catch (Exception e) { + e.printStackTrace(); + policyVisibility.setValue("failed"); + } + }); + } + @On(functionName = "reload") + public void reload() { + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F)); + reload0(); + } +} diff --git a/loader/src/main/resources/privacyPolicyTest.gui b/loader/src/main/resources/privacyPolicyTest.gui new file mode 100644 index 00000000..988a0d8b --- /dev/null +++ b/loader/src/main/resources/privacyPolicyTest.gui @@ -0,0 +1,43 @@ +<!-- + ~ Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod + ~ Copyright (C) 2023 cyoung06 (syeyoung) + ~ + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU Affero General Public License as published + ~ by the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU Affero General Public License for more details. + ~ + ~ You should have received a copy of the GNU Affero General Public License + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. + --> + +<padding left="10" top="10" right="10" bottom="10"> + <col crossAlign="STRETCH"> + <PolicyVersion version="2" bind:policyVersion="policyVersion"/> + <Text text="Dungeons Guide Privacy Policy" size="16" align="CENTER"/> + <size width="0" height="5"/> + <Text text="Last updated 12, Nov, 2023" align="RIGHT"/> + <size width="0" height="10"/> + <Text text="Privacy Policy Summary" size="16" align="LEFT"/> + <size width="0" height="10"/> + <Text text="§lWhat data we collect" size="12" align="LEFT"/> + <size width="0" height="10"/> + <Text text="Dungeons Guide collects the following information from users who accept our Privacy Policy and Terms of Service through their continued use of the platform, products, and services:" size="8" align="LEFT"/> + <size width="0" height="5"/> + <Text text="- Minecraft username and UUID" size="8" align="LEFT"/> + <Text text="- users' Hypixel party members" size="8" align="LEFT"/> + <Text text="- The time users last contacted Dungeons Guide backend" size="8" align="LEFT"/> + <Text text="- Dungeon Scores users get (This is anonymized, and it is to reverse engineer the time score formula)" size="8" align="LEFT"/> + <Text text="- Dungeons Guide Error Stacktraces (This is anonymized, Opt out at /dg -> Misc -> Collect Error Logs) Only Applicable to users using 4.0.0-beta8.4 or later." size="8" align="LEFT"/> + <size width="0" height="20"/> + <Text text="Privacy Policy" size="16" align="LEFT"/> + <Text text="There still isn't anything here currently" align="LEFT"/> + <Text text="You will be prompted to accept to the privacy policy again when it actually gets added" align="LEFT"/> + <Text text="The above section exists for the purpose to inform users about the data we collect currently" align="LEFT"/> + </col> +</padding>
\ No newline at end of file diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/DungeonsGuide.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/DungeonsGuide.java index c55d21cd..15329e9b 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/DungeonsGuide.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/DungeonsGuide.java @@ -37,6 +37,7 @@ import kr.syeyoung.dungeonsguide.mod.events.listener.DungeonListener; import kr.syeyoung.dungeonsguide.mod.events.listener.PacketInjector; import kr.syeyoung.dungeonsguide.mod.events.listener.PacketListener; import kr.syeyoung.dungeonsguide.mod.features.FeatureRegistry; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import kr.syeyoung.dungeonsguide.mod.guiv2.elements.richtext.fonts.DefaultFontRenderer; import kr.syeyoung.dungeonsguide.mod.overlay.OverlayManager; import kr.syeyoung.dungeonsguide.mod.party.PartyManager; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/VersionInfo.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/VersionInfo.java index 37b6c212..8f327986 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/VersionInfo.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/VersionInfo.java @@ -24,6 +24,7 @@ import kr.syeyoung.dungeonsguide.launcher.branch.UpdateBranch; import kr.syeyoung.dungeonsguide.launcher.branch.UpdateRetrieverUtil; import kr.syeyoung.dungeonsguide.launcher.gui.screen.GuiDisplayer; import kr.syeyoung.dungeonsguide.launcher.loader.*; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import kr.syeyoung.dungeonsguide.mod.guiv2.GuiScreenAdapter; import kr.syeyoung.dungeonsguide.mod.guiv2.elements.GlobalHUDScale; import kr.syeyoung.dungeonsguide.mod.guiv2.elements.Scaler; @@ -53,6 +54,7 @@ public class VersionInfo { VERSION1 = properties.getProperty("VERSION"); MANDATORY_VERSION1 = Integer.parseInt(properties.getProperty("MANDATORY_VERSION", "0")); } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); VERSION1 = "unknown"; MANDATORY_VERSION1 = 0; e.printStackTrace(); @@ -133,6 +135,7 @@ public class VersionInfo { logger.error("Failed to check version: Unknown Loader: " + VersionInfo.getLoaderInfo() + " / " + VersionInfo.getCurrentLoader().getClass().getName()); } } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); logger.error("Error while checking for updates: ",e); } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java index a5eb360f..f8e89c63 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java @@ -18,6 +18,7 @@ package kr.syeyoung.dungeonsguide.mod.chat; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiNewChat; import net.minecraft.util.ChatComponentText; @@ -81,6 +82,7 @@ public class ChatProcessor { } } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); e.printStackTrace(); } } @@ -108,6 +110,7 @@ public class ChatProcessor { if (chatProcessResult.isRemoveChat()) chatReceivedEvent.setResult(Event.Result.DENY); if (chatProcessResult.isRemoveListener()) it.remove(); } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); e.printStackTrace(); } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java index b120499e..c67128ff 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java @@ -27,6 +27,7 @@ import kr.syeyoung.dungeonsguide.mod.config.guiconfig.location2.HUDLocationConfi import kr.syeyoung.dungeonsguide.mod.cosmetics.CosmeticsManager; import kr.syeyoung.dungeonsguide.mod.discord.DiscordIntegrationManager; import kr.syeyoung.dungeonsguide.mod.features.FeatureRegistry; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.FeatureViewPlayerStatsOnJoin; import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.HoverEventRenderPlayer; import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.api.ApiFetcher; @@ -216,6 +217,7 @@ public class CommandDungeonsGuide extends CommandBase { target = null; } } catch (Exception t) { + FeatureCollectDiagnostics.queueSendLogAsync(t); t.printStackTrace(); } } @@ -272,6 +274,7 @@ public class CommandDungeonsGuide extends CommandBase { ))))); }); } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); e.printStackTrace(); } } @@ -299,6 +302,7 @@ public class CommandDungeonsGuide extends CommandBase { .put("payload", actualPayload).toString() )); } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); e.printStackTrace(); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java index 2d73ff92..c31b6829 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java @@ -25,6 +25,7 @@ import kr.syeyoung.dungeonsguide.mod.cosmetics.surgical.SurgicalReplacer; import kr.syeyoung.dungeonsguide.mod.events.impl.PlayerListItemPacketEvent; import kr.syeyoung.dungeonsguide.mod.events.impl.StompConnectedEvent; import kr.syeyoung.dungeonsguide.mod.features.FeatureRegistry; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import kr.syeyoung.dungeonsguide.mod.stomp.StompHeader; import kr.syeyoung.dungeonsguide.mod.stomp.StompManager; import kr.syeyoung.dungeonsguide.mod.stomp.StompPayload; @@ -166,7 +167,9 @@ public class CosmeticsManager { EntityPlayer entityPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByUUID(activeCosmetic.getPlayerUID()); if (entityPlayer != null) entityPlayer.refreshDisplayName(); } - } catch (Exception exception) {exception.printStackTrace();} + } catch (Exception exception) { + FeatureCollectDiagnostics.queueSendLogAsync(exception); + exception.printStackTrace();} }); @@ -199,7 +202,8 @@ public class CosmeticsManager { EntityPlayer entityPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByUUID(cosmeticData.getPlayerUID()); if (entityPlayer != null) entityPlayer.refreshDisplayName(); } - } catch (Exception exception) {exception.printStackTrace();} + } catch (Exception exception) { + FeatureCollectDiagnostics.queueSendLogAsync(exception);exception.printStackTrace();} } rebuildCaches(); }); @@ -254,6 +258,7 @@ public class CosmeticsManager { contextThreadLocal.set(total); } catch (Exception t) { System.out.println(clientChatReceivedEvent.message); + FeatureCollectDiagnostics.queueSendLogAsync(t); t.printStackTrace(); } } @@ -368,6 +373,7 @@ public class CosmeticsManager { } clientChatReceivedEvent.message = SurgicalReplacer.combine(chatComponents); } catch (Exception t) { + FeatureCollectDiagnostics.queueSendLogAsync(t); System.out.println(clientChatReceivedEvent.message); t.printStackTrace(); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/DiscordIntegrationManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/DiscordIntegrationManager.java index 86cf868c..b60ef7a7 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/DiscordIntegrationManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/DiscordIntegrationManager.java @@ -32,6 +32,7 @@ import kr.syeyoung.dungeonsguide.mod.events.impl.DiscordUserJoinRequestEvent; import kr.syeyoung.dungeonsguide.mod.events.impl.DiscordUserUpdateEvent; import kr.syeyoung.dungeonsguide.mod.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.mod.features.impl.discord.inviteViewer.Reply; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import kr.syeyoung.dungeonsguide.mod.party.PartyContext; import kr.syeyoung.dungeonsguide.mod.party.PartyManager; import lombok.Getter; @@ -127,6 +128,7 @@ public class DiscordIntegrationManager implements IPCListener { System.out.println("Connecting"); } catch (NoDiscordClientException ignored) { } catch (Exception t) { + FeatureCollectDiagnostics.queueSendLogAsync(t); t.printStackTrace(); } } @@ -184,7 +186,8 @@ public class DiscordIntegrationManager implements IPCListener { JDiscordRelation relation = JDiscordRelation.parse(obj); relationMap.put(relation.getDiscordUser().getIdLong(), relation); } - } catch (Exception e) {e.printStackTrace();} + } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e);e.printStackTrace();} } private void sendRichPresence(RichPresence presence) { @@ -241,6 +244,7 @@ public class DiscordIntegrationManager implements IPCListener { updatePresence(); } } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); e.printStackTrace(); // let thread just die if catastrophic failure occurs. } try { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/DungeonFacade.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/DungeonFacade.java index 9ee4a55a..2b721192 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/DungeonFacade.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/DungeonFacade.java @@ -20,6 +20,7 @@ package kr.syeyoung.dungeonsguide.mod.dungeon; import kr.syeyoung.dungeonsguide.launcher.Main; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoomInfoRegistry; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import lombok.Getter; import lombok.Setter; @@ -47,6 +48,7 @@ public class DungeonFacade { DungeonRoomInfoRegistry.loadAll(Main.getConfigDir()); } catch (BadPaddingException | InvalidKeyException | NoSuchPaddingException | IllegalBlockSizeException | IOException | NoSuchAlgorithmException | InvalidAlgorithmParameterException e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); e.printStackTrace(); } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/PathfinderExecutorExecutor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/PathfinderExecutorExecutor.java index fc991023..c7bf2e2a 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/PathfinderExecutorExecutor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/PathfinderExecutorExecutor.java @@ -21,6 +21,7 @@ package kr.syeyoung.dungeonsguide.mod.dungeon; import kr.syeyoung.dungeonsguide.mod.DungeonsGuide; import kr.syeyoung.dungeonsguide.mod.dungeon.pathfinding.algorithms.PathfinderExecutor; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import net.minecraft.client.Minecraft; import net.minecraft.util.BlockPos; import scala.reflect.internal.util.WeakHashSet; @@ -70,6 +71,7 @@ public class PathfinderExecutorExecutor extends Thread{ } // Thread.yield(); } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); e.printStackTrace(); // wtf? try { Thread.sleep(1000); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java index ea1ce09b..04eac305 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java @@ -42,6 +42,7 @@ import kr.syeyoung.dungeonsguide.mod.dungeon.roomprocessor.ProcessorFactory; import kr.syeyoung.dungeonsguide.mod.dungeon.roomprocessor.RoomProcessor; import kr.syeyoung.dungeonsguide.mod.dungeon.roomprocessor.RoomProcessorGenerator; import kr.syeyoung.dungeonsguide.mod.features.FeatureRegistry; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import kr.syeyoung.dungeonsguide.mod.features.impl.secret.FeaturePathfindStrategy; import lombok.AllArgsConstructor; import lombok.Getter; @@ -222,8 +223,10 @@ public class DungeonRoom { matchRoomAndSetupRoomProcessor(); matched = true; } catch (Exception e) { - if (e.getMessage() == null || !e.getMessage().contains("Chunk not loaded")) + if (e.getMessage() == null || !e.getMessage().contains("Chunk not loaded")) { + FeatureCollectDiagnostics.queueSendLogAsync(e); e.printStackTrace(); + } } finally { matching = false; } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorIcePath.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorIcePath.java index e8088828..337bfe7d 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorIcePath.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorIcePath.java @@ -23,6 +23,7 @@ import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.features.FeatureRegistry; +import kr.syeyoung.dungeonsguide.mod.features.impl.etc.FeatureCollectDiagnostics; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.AllArgsConstructor; import lombok.Getter; @@ -78,6 +79,7 @@ public class RoomProcessorIcePath extends GeneralRoomProcessor { buildMap(); err = false; } catch (Exception e) { + FeatureCollectDiagnostics.queueSendLogAsync(e); e.printStackTrace(); err = true; return; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java index a96b23e6..224279fe 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java +++ b/ |