diff --git a/Server/pom.xml b/Server/pom.xml
index 7eb97c0a7..aa0adc0be 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -57,17 +57,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.rs09</groupId>
-      <artifactId>consts</artifactId>
+      <groupId>org.rs09.consts</groupId>
+      <artifactId>ConstLib</artifactId>
       <version>1.4</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.rs09</groupId>
-      <artifactId>primextends</artifactId>
-      <version>1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -247,5 +241,20 @@
       <name>Maven Central</name>
       <url>https://repo.maven.apache.org/maven2/</url>
     </repository>
+    <repository>
+      <id>gitlab-maven</id>
+      <url>https://gitlab.com/api/v4/projects/32237206/packages/maven</url>
+    </repository>
   </repositories>
+  <distributionManagement>
+    <repository>
+      <id>gitlab-maven</id>
+      <url>https://gitlab.com/api/v4/projects/32237206/packages/maven</url>
+    </repository>
+
+    <snapshotRepository>
+      <id>gitlab-maven</id>
+      <url>https://gitlab.com/api/v4/projects/32237206/packages/maven</url>
+    </snapshotRepository>
+  </distributionManagement>
 </project>
diff --git a/Server/src/main/kotlin/api/ApiExtensions.kt b/Server/src/main/kotlin/api/ApiExtensions.kt
index e0c1537b8..43d695337 100644
--- a/Server/src/main/kotlin/api/ApiExtensions.kt
+++ b/Server/src/main/kotlin/api/ApiExtensions.kt
@@ -21,4 +21,36 @@ fun Collection<IntArray>.toIntArray() : IntArray {
     val list = ArrayList<Int>()
     this.forEach { arr -> arr.forEach { list.add(it) } }
     return list.toIntArray()
+}
+
+inline fun <reified T> Collection<T>.isLast(element: T) : Boolean {
+    return this.indexOf(element) == this.size - 1
+}
+
+inline fun <reified T> Collection<T>.getNext(element: T) : T {
+    val idx = this.indexOf(element)
+    return if (idx < this.size - 1)
+        this.elementAt(idx + 1)
+    else
+        element
+}
+
+inline fun <reified T> Collection<T>.isNextLast(element: T) : Boolean {
+    return this.isLast(this.getNext(element))
+}
+
+fun IntArray.isLast(element: Int) : Boolean {
+    return this.indexOf(element) == this.size - 1
+}
+
+fun IntArray.getNext(element: Int) : Int {
+    val idx = this.indexOf(element)
+    return if (idx < this.size - 1)
+        this.elementAt(idx + 1)
+    else
+        element
+}
+
+fun IntArray.isNextLast(element: Int) : Boolean {
+    return this.isLast(this.getNext(element))
 }
\ No newline at end of file
diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt
index 38b1e4cfb..d1e0eb686 100644
--- a/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt
+++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt
@@ -20,8 +20,6 @@ import core.game.world.update.flag.context.Animation
 import core.game.world.update.flag.context.Graphics
 import org.rs09.consts.Items
 import org.rs09.consts.NPCs
-import org.rs09.primextends.getNext
-import org.rs09.primextends.isLast
 import rs09.game.interaction.InteractionListener
 import rs09.game.system.config.ItemConfigParser
 import rs09.game.world.GameWorld.Pulser
diff --git a/Server/src/main/kotlin/rs09/game/node/entity/combat/equipment/EquipmentDegrader.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/equipment/EquipmentDegrader.kt
index 2e5589d53..0ad809196 100644
--- a/Server/src/main/kotlin/rs09/game/node/entity/combat/equipment/EquipmentDegrader.kt
+++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/equipment/EquipmentDegrader.kt
@@ -1,10 +1,10 @@
 package rs09.game.node.entity.combat.equipment
 
+import api.getNext
+import api.isLast
+import api.isNextLast
 import core.game.node.entity.player.Player
 import core.game.node.item.Item
-import org.rs09.primextends.getNext
-import org.rs09.primextends.isLast
-import org.rs09.primextends.isNextLast
 
 /**
  * Handles equipment degrading