Merged 1.18 into 1.16

Signed-off-by: DeathsGun <deathsgun@protonmail.com>

Author: DeathsGun

src/main/kotlin/xyz/deathsgun/modmanager/gui/ModsOverviewScreen.kt

@@ -85,7 +85,7 @@ class ModsOverviewScreen(private val previousScreen: Screen) : Screen(LiteralTex
         updateAll = addButton(
             ButtonWidget(width - 100 - 10, 10, 100, 20, TranslatableText("modmanager.button.updateAll")) {
                 ModManager.modManager.icons.destroyAll()
-                client?.setScreen(UpdateAllScreen(this))
+                client?.openScreen(UpdateAllScreen(this))
             }
         )
         updateAll.visible = false

src/main/kotlin/xyz/deathsgun/modmanager/gui/UpdateAllScreen.kt

@@ -31,7 +31,7 @@ class UpdateAllScreen(private val parentScreen: Screen) : Screen(TranslatableTex
             this
         )
         updateList.setLeftPos(25)
-        doneButton = addDrawableChild(ButtonWidget(width / 2 - 100, height - 30, 200, 20, ScreenTexts.DONE) {
+        doneButton = addButton(ButtonWidget(width / 2 - 100, height - 30, 200, 20, ScreenTexts.DONE) {
             onClose()
         })
         doneButton.active = false
@@ -72,7 +72,7 @@ class UpdateAllScreen(private val parentScreen: Screen) : Screen(TranslatableTex
     }
 
     override fun onClose() {
-        client?.setScreen(parentScreen)
+        client?.openScreen(parentScreen)
     }
 
     override fun <E> updateSelectedEntry(widget: Any, entry: E?) {

src/main/kotlin/xyz/deathsgun/modmanager/gui/widget/UpdateProgressListEntry.kt

@@ -8,8 +8,6 @@ import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawableHelper
 import net.minecraft.client.gui.screen.ScreenTexts
 import net.minecraft.client.util.math.MatrixStack
-import net.minecraft.text.LiteralText
-import net.minecraft.text.Text
 import xyz.deathsgun.modmanager.ModManager
 import xyz.deathsgun.modmanager.api.gui.list.ListWidget
 import xyz.deathsgun.modmanager.update.ProgressListener
@@ -76,8 +74,4 @@ class UpdateProgressListEntry(list: ListWidget<UpdateProgressListEntry>, val upd
         DrawableHelper.fill(matrices, minX, minY, minX + 1, maxY, color)
         DrawableHelper.fill(matrices, maxX, minY, maxX - 1, maxY, color)
     }
-
-    override fun getNarration(): Text {
-        return LiteralText.EMPTY
-    }
 }

src/main/kotlin/xyz/deathsgun/modmanager/icon/IconCache.kt

@@ -26,14 +26,12 @@ import net.minecraft.client.texture.NativeImageBackedTexture
 import net.minecraft.util.Identifier
 import org.apache.commons.io.FileUtils
 import org.apache.http.client.methods.HttpGet
-import org.apache.http.impl.client.CloseableHttpClient
-import org.apache.http.impl.client.HttpClients
 import org.apache.logging.log4j.LogManager
 import xyz.deathsgun.modmanager.ModManager
 import xyz.deathsgun.modmanager.api.http.HttpClient
 import xyz.deathsgun.modmanager.api.mod.Mod
-import java.net.URI
 import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import java.util.stream.Collectors
 
 class IconCache {
@@ -96,7 +94,11 @@ class IconCache {
         try {
             val request = HttpGet(mod.iconUrl)
             request.setHeader("User-Agent", "ModManager ${ModManager.getVersion()}")
-            Files.copy(HttpClient.getInputStream(mod.iconUrl), iconsDir.resolve(mod.id))
+            Files.copy(
+                HttpClient.getInputStream(mod.iconUrl),
+                iconsDir.resolve(mod.id),
+                StandardCopyOption.REPLACE_EXISTING
+            )
             state[mod.id] = IconState.DOWNLOADED
         } catch (e: Exception) {
             if (e is HttpClient.InvalidStatusCodeException) {