meta: Add clipboard caching (#1229)

3 files changed, 7 insertions, 13 deletions

diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt
index 15c26daa..e8023f52 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt
@@ -23,7 +23,6 @@ import com.mojang.brigadier.arguments.StringArgumentType
 import io.github.moulberry.notenoughupdates.BuildFlags
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates
 import io.github.moulberry.notenoughupdates.autosubscribe.NEUAutoSubscribe
-import io.github.moulberry.notenoughupdates.core.util.MiscUtils
 import io.github.moulberry.notenoughupdates.events.RegisterBrigadierCommandEvent
 import io.github.moulberry.notenoughupdates.miscfeatures.FishingHelper
 import io.github.moulberry.notenoughupdates.miscfeatures.customblockzones.CustomBiomes
@@ -253,7 +252,7 @@ class DevTestCommand {
             }
             thenLiteralExecute("copytablist") {
                 val tabList = TabListUtils.getTabList().joinToString("\n", postfix = "\n")
-                MiscUtils.copyToClipboard(tabList)
+                Utils.copyToClipboard(tabList)
                 reply("Copied tablist to clipboard!")
             }.withHelp("Copy the tab list")
             thenLiteral("useragent") {
diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/NEUStatsCommand.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/NEUStatsCommand.kt
index 85a14e15..fee66cbe 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/NEUStatsCommand.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/NEUStatsCommand.kt
@@ -25,14 +25,11 @@ import com.sun.management.UnixOperatingSystemMXBean
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates
 import io.github.moulberry.notenoughupdates.autosubscribe.NEUAutoSubscribe
 import io.github.moulberry.notenoughupdates.events.RegisterBrigadierCommandEvent
-import io.github.moulberry.notenoughupdates.util.DiscordMarkdownBuilder
-import io.github.moulberry.notenoughupdates.util.SBInfo
-import io.github.moulberry.notenoughupdates.util.TabListUtils
+import io.github.moulberry.notenoughupdates.util.*
 import io.github.moulberry.notenoughupdates.util.brigadier.reply
 import io.github.moulberry.notenoughupdates.util.brigadier.thenExecute
 import io.github.moulberry.notenoughupdates.util.brigadier.thenLiteralExecute
 import io.github.moulberry.notenoughupdates.util.brigadier.withHelp
-import io.github.moulberry.notenoughupdates.util.copyToClipboard
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.OpenGlHelper
 import net.minecraft.command.ICommandSender
@@ -44,7 +41,6 @@ import net.minecraftforge.fml.common.Loader
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.lwjgl.opengl.Display
 import org.lwjgl.opengl.GL11
-import java.awt.Toolkit
 import java.awt.datatransfer.StringSelection
 import java.lang.management.ManagementFactory
 import javax.management.JMX
@@ -239,7 +235,7 @@ class NEUStatsCommand {
         }
         try {
             val clipboard = StringSelection(data)
-            Toolkit.getDefaultToolkit().systemClipboard.setContents(clipboard, null)
+            Utils.copyToClipboard(clipboard, null)
             reply("${GREEN}Dev info copied to clipboard.")
         } catch (ignored: Exception) {
             reply("${DARK_RED}Could not copy to clipboard.")
diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/PackDevCommand.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/PackDevCommand.kt
index e083cd06..0b5ba512 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/PackDevCommand.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/PackDevCommand.kt
@@ -23,8 +23,8 @@ import com.mojang.brigadier.arguments.DoubleArgumentType.doubleArg
 import com.mojang.brigadier.builder.ArgumentBuilder
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates
 import io.github.moulberry.notenoughupdates.autosubscribe.NEUAutoSubscribe
-import io.github.moulberry.notenoughupdates.core.util.MiscUtils
 import io.github.moulberry.notenoughupdates.events.RegisterBrigadierCommandEvent
+import io.github.moulberry.notenoughupdates.util.Utils
 import io.github.moulberry.notenoughupdates.util.brigadier.*
 import net.minecraft.block.state.IBlockState
 import net.minecraft.client.Minecraft
@@ -39,7 +39,6 @@ import net.minecraft.item.ItemStack
 import net.minecraft.tileentity.TileEntitySkull
 import net.minecraft.util.EnumChatFormatting
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.*
 
 
 @NEUAutoSubscribe
@@ -71,7 +70,7 @@ class PackDevCommand {
                     reply("No $name found within $dist blocks")
                     return@thenArgumentExecute
                 }
-                MiscUtils.copyToClipboard(StringBuilder().also { it.appendEntityData(entity) }.toString().trim())
+                Utils.copyToClipboard(StringBuilder().also { it.appendEntityData(entity) }.toString().trim())
                 reply("Copied data to clipboard")
             }.withHelp("Find the nearest $name and copy data about them to your clipboard")
         }
@@ -85,7 +84,7 @@ class PackDevCommand {
                     entity.forEach {
                         sb.appendEntityData(it)
                     }
-                    MiscUtils.copyToClipboard(sb.toString().trim())
+                    Utils.copyToClipboard(sb.toString().trim())
 
                     reply("Copied data to clipboard")
                 }
@@ -174,7 +173,7 @@ class PackDevCommand {
                         }
                     }.toString().trim()
 
-                    MiscUtils.copyToClipboard(s)
+                    Utils.copyToClipboard(s)
                     reply("Copied data to clipboard")
                     return@thenLiteralExecute
                 }