From 61402afd93d187c167c72dc285d7fce96c6acdf6 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 17 Oct 2023 21:43:01 -0500 Subject: [PATCH] Fix DH auto update jar deletion and add more logging --- .../distanthorizons/common/wrappers/gui/ClassicConfigGUI.java | 4 +--- coreSubProjects | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java index b3411c7e4..0df21fe0c 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java @@ -28,7 +28,6 @@ import com.seibel.distanthorizons.common.wrappers.gui.updater.ChangelogScreen; // Minecraft imports -import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; import com.seibel.distanthorizons.core.util.AnnotationUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui; @@ -48,7 +47,6 @@ import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.client.resources.language.I18n; // translation #if POST_MC_1_17_1 @@ -402,7 +400,7 @@ public class ClassicConfigGUI DhDrawString(matrices, font, TextOrLiteral(ModInfo.VERSION), 2, height - 10, 0xAAAAAA); // If the update is pending, display this message to inform the user that it will apply when the game restarts - if (SelfUpdater.deleteOldOnClose) + if (SelfUpdater.deleteOldJarOnJvmShutdown) DhDrawString(matrices, font, Translatable(configBase.modID + ".updater.waitingForClose"), 4, height - 38, 0xFFFFFF); } diff --git a/coreSubProjects b/coreSubProjects index 201c0c3e3..29fabe184 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 201c0c3e3e7b19801b26203bbb135b49a4c09744 +Subproject commit 29fabe1849dfc3f5745b86e4a7d02909c5f04b81