From 1a4724dcced6bf7c79b90a484acac9a23fac6894 Mon Sep 17 00:00:00 2001
From: Major- <major@emulate.rs>
Date: Tue, 28 Aug 2018 18:50:54 +0100
Subject: [PATCH] Repackage player actions plugin

---
 game/plugin/entity/{player-action => actions}/build.gradle    | 0
 .../entity/{player-action => actions}/src/PlayerAction.kt     | 2 +-
 .../entity/{player-action => actions}/src/PlayerActionType.kt | 2 +-
 .../{player-action => actions}/src/PlayerActions.plugin.kts   | 2 +-
 .../{player-action => actions}/test/PlayerActionTests.kt      | 2 +-
 game/plugin/entity/following/build.gradle                     | 4 +---
 game/plugin/entity/following/src/following.plugin.kts         | 4 ++--
 7 files changed, 7 insertions(+), 9 deletions(-)
 rename game/plugin/entity/{player-action => actions}/build.gradle (100%)
 rename game/plugin/entity/{player-action => actions}/src/PlayerAction.kt (95%)
 rename game/plugin/entity/{player-action => actions}/src/PlayerActionType.kt (80%)
 rename game/plugin/entity/{player-action => actions}/src/PlayerActions.plugin.kts (90%)
 rename game/plugin/entity/{player-action => actions}/test/PlayerActionTests.kt (96%)

diff --git a/game/plugin/entity/player-action/build.gradle b/game/plugin/entity/actions/build.gradle
similarity index 100%
rename from game/plugin/entity/player-action/build.gradle
rename to game/plugin/entity/actions/build.gradle
diff --git a/game/plugin/entity/player-action/src/PlayerAction.kt b/game/plugin/entity/actions/src/PlayerAction.kt
similarity index 95%
rename from game/plugin/entity/player-action/src/PlayerAction.kt
rename to game/plugin/entity/actions/src/PlayerAction.kt
index 22026b62..ff8fd6d2 100644
--- a/game/plugin/entity/player-action/src/PlayerAction.kt
+++ b/game/plugin/entity/actions/src/PlayerAction.kt
@@ -1,4 +1,4 @@
-package org.apollo.game.plugin.entity.player_action
+package org.apollo.game.plugin.entity.actions
 
 import org.apollo.game.message.impl.SetPlayerActionMessage
 import org.apollo.game.model.entity.Player
diff --git a/game/plugin/entity/player-action/src/PlayerActionType.kt b/game/plugin/entity/actions/src/PlayerActionType.kt
similarity index 80%
rename from game/plugin/entity/player-action/src/PlayerActionType.kt
rename to game/plugin/entity/actions/src/PlayerActionType.kt
index b4ac185f..04934915 100644
--- a/game/plugin/entity/player-action/src/PlayerActionType.kt
+++ b/game/plugin/entity/actions/src/PlayerActionType.kt
@@ -1,4 +1,4 @@
-package org.apollo.game.plugin.entity.player_action
+package org.apollo.game.plugin.entity.actions
 
 enum class PlayerActionType(val displayName: String, val slot: Int, val primary: Boolean = true) {
     ATTACK("Attack", 2),
diff --git a/game/plugin/entity/player-action/src/PlayerActions.plugin.kts b/game/plugin/entity/actions/src/PlayerActions.plugin.kts
similarity index 90%
rename from game/plugin/entity/player-action/src/PlayerActions.plugin.kts
rename to game/plugin/entity/actions/src/PlayerActions.plugin.kts
index 6b4a0fe4..675a8a53 100644
--- a/game/plugin/entity/player-action/src/PlayerActions.plugin.kts
+++ b/game/plugin/entity/actions/src/PlayerActions.plugin.kts
@@ -1,4 +1,4 @@
-package org.apollo.game.plugin.entity.player_action
+package org.apollo.game.plugin.entity.actions
 
 import org.apollo.game.message.impl.PlayerActionMessage
 import org.apollo.game.model.event.impl.LoginEvent
diff --git a/game/plugin/entity/player-action/test/PlayerActionTests.kt b/game/plugin/entity/actions/test/PlayerActionTests.kt
similarity index 96%
rename from game/plugin/entity/player-action/test/PlayerActionTests.kt
rename to game/plugin/entity/actions/test/PlayerActionTests.kt
index 4c1dc248..2a654693 100644
--- a/game/plugin/entity/player-action/test/PlayerActionTests.kt
+++ b/game/plugin/entity/actions/test/PlayerActionTests.kt
@@ -1,4 +1,4 @@
-package org.apollo.game.plugin.entity.player_action
+package org.apollo.game.plugin.entity.actions
 
 import io.mockk.verify
 import org.apollo.game.message.impl.SetPlayerActionMessage
diff --git a/game/plugin/entity/following/build.gradle b/game/plugin/entity/following/build.gradle
index 3f43d5f0..e81c73d4 100644
--- a/game/plugin/entity/following/build.gradle
+++ b/game/plugin/entity/following/build.gradle
@@ -1,13 +1,11 @@
 apply plugin: 'kotlin'
 
-
-
 dependencies {
     implementation project(':game')
     implementation project(':cache')
     implementation project(':net')
     implementation project(':util')
     implementation project(':game:plugin:entity:walk-to')
-    implementation project(':game:plugin:entity:player-action')
+    implementation project(':game:plugin:entity:actions')
     testImplementation project(':game:plugin-testing')
 }
diff --git a/game/plugin/entity/following/src/following.plugin.kts b/game/plugin/entity/following/src/following.plugin.kts
index 25e97d82..26e8f289 100644
--- a/game/plugin/entity/following/src/following.plugin.kts
+++ b/game/plugin/entity/following/src/following.plugin.kts
@@ -1,5 +1,5 @@
-import org.apollo.game.plugin.entity.player_action.PlayerActionEvent
-import org.apollo.game.plugin.entity.player_action.PlayerActionType
+import org.apollo.game.plugin.entity.actions.PlayerActionEvent
+import org.apollo.game.plugin.entity.actions.PlayerActionType
 import org.apollo.plugin.entity.following.FollowAction
 
 on_player_event { PlayerActionEvent::class }