Merge pull request #7639 from deathbeam/wtf

Move timestamp color config to timestamp plugin

runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java

@@ -509,22 +509,4 @@ public interface ChatColorConfig extends Config
 		description = "Color of Friend Usernames in Public Chat (transparent)"
 	)
 	Color transparentPublicFriendUsernames();
-
-	//Plugin specific chat colours
-
-	@ConfigItem(
-		position = 88,
-		keyName = "opaqueTimestamp",
-		name = "Timestamps (opaque)",
-		description = "Colour of Timestamps from the Timestamps plugin (opaque)"
-	)
-	Color opaqueTimestamp();
-
-	@ConfigItem(
-		position = 89,
-		keyName = "transparentTimestamp",
-		name = "Timestamps (transparent)",
-		description = "Colour of Timestamps from the Timestamps plugin (transparent)"
-	)
-	Color transparentTimestamp();
 }

runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampConfig.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2019, Tomas Slusny <slusnucky@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.client.plugins.timestamp;
+
+import java.awt.Color;
+import net.runelite.client.config.Config;
+import net.runelite.client.config.ConfigGroup;
+import net.runelite.client.config.ConfigItem;
+
+@ConfigGroup("timestamp")
+public interface TimestampConfig extends Config
+{
+	@ConfigItem(
+		keyName = "opaqueTimestamp",
+		name = "Timestamps (opaque)",
+		description = "Colour of Timestamps from the Timestamps plugin (opaque)"
+	)
+	Color opaqueTimestamp();
+
+	@ConfigItem(
+		keyName = "transparentTimestamp",
+		name = "Timestamps (transparent)",
+		description = "Colour of Timestamps from the Timestamps plugin (transparent)"
+	)
+	Color transparentTimestamp();
+}

runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java

@@ -25,6 +25,7 @@
  */
 package net.runelite.client.plugins.timestamp;
 
+import com.google.inject.Provides;
 import java.awt.Color;
 import java.time.Instant;
 import java.time.ZoneId;
@@ -35,7 +36,7 @@ import net.runelite.api.Client;
 import net.runelite.api.MessageNode;
 import net.runelite.api.Varbits;
 import net.runelite.api.events.ScriptCallbackEvent;
-import net.runelite.client.config.ChatColorConfig;
+import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
@@ -53,7 +54,13 @@ public class TimestampPlugin extends Plugin
 	private Client client;
 
 	@Inject
-	private ChatColorConfig chatColorConfig;
+	private TimestampConfig config;
+
+	@Provides
+	public TimestampConfig provideConfig(final ConfigManager configManager)
+	{
+		return configManager.getConfig(TimestampConfig.class);
+	}
 
 	@Subscribe
 	public void onScriptCallbackEvent(ScriptCallbackEvent event)
@@ -94,6 +101,6 @@ public class TimestampPlugin extends Plugin
 	{
 		boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1;
 
-		return isChatboxTransparent ? chatColorConfig.transparentTimestamp() : chatColorConfig.opaqueTimestamp();
+		return isChatboxTransparent ? config.transparentTimestamp() : config.opaqueTimestamp();
 	}
 }