Add "sides mode"

MP3Martin · Nov 21, 2022 · 1665625 · 1665625
1 parent eec0708
commit 1665625
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>xyz.mp3martin.biggerhotbar</groupId>
     <artifactId>BiggerHotbar</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <packaging>jar</packaging>
 
     <name>BiggerHotbar</name>

diff --git a/src/main/java/xyz/mp3martin/biggerhotbar/biggerhotbar/BiggerHotbar.kt b/src/main/java/xyz/mp3martin/biggerhotbar/biggerhotbar/BiggerHotbar.kt
@@ -12,6 +12,7 @@ class BiggerHotbar : JavaPlugin() {
 
     config.addDefault("bh_enabled", false)
     config.addDefault("maxMovesAtOnce", 4)
+    config.addDefault("mode", "center")
     config.options().copyDefaults(true)
     saveConfig()
 

diff --git a/src/main/java/xyz/mp3martin/biggerhotbar/biggerhotbar/EventListener.kt b/src/main/java/xyz/mp3martin/biggerhotbar/biggerhotbar/EventListener.kt
@@ -28,36 +28,58 @@ class EventListener(plugin: BiggerHotbar) : Listener {
     val oldSlot = event.player.inventory.heldItemSlot
     val bhIsEnabled = plugin.config.getBoolean("bh_enabled")
     val maxMovesAtOnce = plugin.config.getInt("maxMovesAtOnce")
+    val mode = plugin.config.getString("mode")
     if (bhIsEnabled && event.player.hasPermission("biggerhotbar.hotbar")) {
       // - BiggerHotbar is enabled -
       // - Player has permission -
 
-      scheduleSyncDelayedTask(plugin, {
-        val oldSlot = event.player.inventory.heldItemSlot
+      if (mode == "sides") {
+        // - Mode is sides -
+        scheduleSyncDelayedTask(plugin, {
+          val newSlot = event.player.inventory.heldItemSlot
+//          event.player.sendMessage("$oldSlot + $newSlot")
+          val moveLeftOldSlot = (oldSlot == 6 || oldSlot == 7 || oldSlot == 8)
+          val moveRightOldSlot = (oldSlot == 0 || oldSlot == 1 || oldSlot == 2)
+          if ((moveLeftOldSlot && (newSlot == 0 || newSlot == 1 || newSlot == 2)) || (oldSlot == 7 && newSlot == 8) || (oldSlot == 6 && newSlot == 7) || (oldSlot == 6 && newSlot == 8)) {
+            event.player.inventory.heldItemSlot = 6
+            moveItemsHotbarInvSmall(plugin, event.player, 0)
+          } else if ((moveRightOldSlot && (newSlot == 8 || newSlot == 7 || newSlot == 6)) || (oldSlot == 1 && newSlot == 0) || (oldSlot == 2 && newSlot == 1) || (oldSlot == 2 && newSlot == 0)) {
+            event.player.inventory.heldItemSlot = 2
+            moveItemsHotbarInvSmall(plugin, event.player, 1)
+          }
+        }, 1)
+      } else {
+        // - Mode is center -
+        scheduleSyncDelayedTask(plugin, {
+          val oldSlot = event.player.inventory.heldItemSlot
 
-        event.player.inventory.heldItemSlot = 4
+          event.player.inventory.heldItemSlot = 4
 
-        var scrLeft = oldSlot - 4
-        var scrRight = 4 - oldSlot
+          val scrLeft = oldSlot - 4
+          val scrRight = 4 - oldSlot
 
-        if (oldSlot != 4) {
-          if (oldSlot > 4) {
-            for (i in 0..min(scrLeft, maxMovesAtOnce) -1) {
-              moveItemsHotbarInvSmall(plugin, event.player, 0)
-            }
-          } else {
-            for (i in 0..min(scrRight, maxMovesAtOnce) -1) {
-              moveItemsHotbarInvSmall(plugin, event.player, 1)
+          if (oldSlot != 4) {
+            if (oldSlot > 4) {
+              for (i in 0..min(scrLeft, maxMovesAtOnce) - 1) {
+                moveItemsHotbarInvSmall(plugin, event.player, 0)
+              }
+            } else {
+              for (i in 0..min(scrRight, maxMovesAtOnce) - 1) {
+                moveItemsHotbarInvSmall(plugin, event.player, 1)
+              }
             }
           }
-        }
-      }, 1)
+        }, 1)
+      }
     }
     return
   }
 
   @EventHandler
   fun onPlayerJoinEvent(event: PlayerJoinEvent) {
-    centerHotbar(plugin)
+    val mode = plugin.config.getString("mode")
+    if (mode == "center") {
+      centerHotbar(plugin)
+    }
   }
 }
diff --git a/src/main/java/xyz/mp3martin/biggerhotbar/biggerhotbar/commands/BiggerhotbarCommand.kt b/src/main/java/xyz/mp3martin/biggerhotbar/biggerhotbar/commands/BiggerhotbarCommand.kt
@@ -7,7 +7,6 @@ import org.bukkit.entity.Player
 import xyz.mp3martin.biggerhotbar.biggerhotbar.BiggerHotbar
 import xyz.mp3martin.biggerhotbar.biggerhotbar.utils.Settings.formatMessage
 import xyz.mp3martin.biggerhotbar.biggerhotbar.utils.centerHotbar
-import xyz.mp3martin.biggerhotbar.biggerhotbar.utils.moveItemsHotbarInvSmall
 
 
 class BiggerhotbarCommand(plugin: BiggerHotbar) : TabExecutor {
@@ -83,6 +82,32 @@ class BiggerhotbarCommand(plugin: BiggerHotbar) : TabExecutor {
             p.sendMessage(formatMessage("BiggerHotbar is $status"))
           }
 
+          "mode" -> {
+            val mode = plugin.config.getString("mode")
+            try {
+              args[1]
+            } catch (e: Throwable) {
+              args = arrayOf("NOO", "NOO")
+            }
+            if (args[1] == "NOO") {
+              p.sendMessage(formatMessage("Current mode is §3$mode"))
+              p.sendMessage(formatMessage("All available modes are: §3center§r, §3sides"))
+            } else if (args[1].lowercase() == "center") {
+              plugin.config.set("mode", "center")
+              centerHotbar(plugin)
+              p.sendMessage(formatMessage("Successfully changed mode to §3center"))
+              plugin.saveConfig()
+              plugin.reloadConfig()
+            } else if (args[1].lowercase() == "sides") {
+              plugin.config.set("mode", "sides")
+              p.sendMessage(formatMessage("Successfully changed mode to §3sides"))
+              plugin.saveConfig()
+              plugin.reloadConfig()
+            } else {
+              return false
+            }
+          }
+
           "reload" -> {
             val success = try {
               plugin.reloadConfig()
@@ -128,11 +153,17 @@ class BiggerhotbarCommand(plugin: BiggerHotbar) : TabExecutor {
     if (sender.hasPermission("biggerhotbar.commands")) {
       return when (args.size) {
         1 -> {
-          mutableListOf("enable", "disable", "toggle", "status", "reload", "version")
+          mutableListOf("enable", "disable", "toggle", "status", "mode", "reload", "version")
         }
+
         2 -> {
-          null
+          if (args[0] == "mode") {
+            mutableListOf("center", "sides")
+          } else {
+            null
+          }
         }
+
         else -> {
           null
         }

diff --git a/src/main/java/xyz/mp3martin/biggerhotbar/biggerhotbar/utils/CenterHotbar.kt b/src/main/java/xyz/mp3martin/biggerhotbar/biggerhotbar/utils/CenterHotbar.kt
@@ -6,7 +6,8 @@ import xyz.mp3martin.biggerhotbar.biggerhotbar.BiggerHotbar
 
 fun centerHotbar(plugin: BiggerHotbar) {
   val bhIsEnabled = plugin.config.getBoolean("bh_enabled")
-  if (bhIsEnabled) {
+  val mode = plugin.config.getString("mode")
+  if (bhIsEnabled && mode == "center") {
     for (player in getOnlinePlayers()) {
       if(player.hasPermission("biggerhotbar.hotbar")) {
         if (player.inventory.heldItemSlot != 4) {

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -10,4 +10,4 @@ commands:
   biggerhotbar:
     aliases: [bh, bhotbar, biggerh]
     description: Control bigger hotbar plugin
-    usage: /<command> { enable | disable | toggle | status | reload }
+    usage: /<command> <enable | disable | toggle | status | mode [center | sides] | reload | version>