From 1deed7dd0de1e3089fbdbe090327bf425e568e43 Mon Sep 17 00:00:00 2001
From: comp500 <comp500@users.noreply.github.com>
Date: Tue, 17 Jan 2023 05:21:20 +0000
Subject: [PATCH] Fix and simplify side matching code (fixes #54)

---
 .../infra/packwiz/installer/target/Side.kt    | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/main/kotlin/link/infra/packwiz/installer/target/Side.kt b/src/main/kotlin/link/infra/packwiz/installer/target/Side.kt
index bb3d72e..2d2feb8 100644
--- a/src/main/kotlin/link/infra/packwiz/installer/target/Side.kt
+++ b/src/main/kotlin/link/infra/packwiz/installer/target/Side.kt
@@ -4,42 +4,29 @@ import cc.ekblad.toml.model.TomlValue
 import cc.ekblad.toml.tomlMapper
 import com.google.gson.annotations.SerializedName
 
-enum class Side {
+enum class Side(sideName: String) {
 	@SerializedName("client")
 	CLIENT("client"),
 	@SerializedName("server")
 	SERVER("server"),
 	@SerializedName("both")
 	@Suppress("unused")
-	BOTH("both", arrayOf(CLIENT, SERVER));
+	BOTH("both") {
+		override fun hasSide(tSide: Side): Boolean {
+			return true
+		}
+	};
 
 	private val sideName: String
-	private val depSides: Array<Side>?
 
-	constructor(sideName: String) {
+	init {
 		this.sideName = sideName.lowercase()
-		depSides = null
-	}
-
-	constructor(sideName: String, depSides: Array<Side>) {
-		this.sideName = sideName.lowercase()
-		this.depSides = depSides
 	}
 
 	override fun toString() = sideName
 
-	fun hasSide(tSide: Side): Boolean {
-		if (this == tSide) {
-			return true
-		}
-		if (depSides != null) {
-			for (depSide in depSides) {
-				if (depSide == tSide) {
-					return true
-				}
-			}
-		}
-		return false
+	open fun hasSide(tSide: Side): Boolean {
+		return this == tSide || tSide == BOTH
 	}
 
 	companion object {