diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt index 58b149b..ab6b5d6 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionPlaceListener.kt @@ -13,7 +13,6 @@ import com.artillexstudios.axminions.minions.Minion import com.artillexstudios.axminions.minions.Minions import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder import org.bukkit.Material -import org.bukkit.NamespacedKey import org.bukkit.event.EventHandler import org.bukkit.event.Listener import org.bukkit.event.block.Action @@ -28,7 +27,7 @@ class MinionPlaceListener : Listener { fun onPlayerInteractEvent(event: PlayerInteractEvent) { if (event.action != Action.RIGHT_CLICK_BLOCK && event.action != Action.RIGHT_CLICK_AIR) return if (event.clickedBlock == null) return - val item = event.player.inventory.itemInMainHand ?: return + val item = event.player.inventory.getItem(event.hand ?: return) ?: return var meta = item.itemMeta ?: return val type = meta.persistentDataContainer.get(Keys.MINION_TYPE, PersistentDataType.STRING) ?: return diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/CrafterMinionType.kt b/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/CrafterMinionType.kt index 63f3115..0300ee4 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/CrafterMinionType.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/CrafterMinionType.kt @@ -60,7 +60,9 @@ class CrafterMinionType : MinionType("collector", AxMinionsPlugin.INSTANCE.getRe val shapeless = arrayListOf() for (recipe in recipes) { + println("RECIPE!") if (recipe is ShapedRecipe) { + println("SHAPED!") shaped.add(recipe) } else if (recipe is ShapelessRecipe) { shapeless.add(recipe) diff --git a/common/src/main/resources/minions/collector.yml b/common/src/main/resources/minions/collector.yml index 3f3382f..0f779cb 100644 --- a/common/src/main/resources/minions/collector.yml +++ b/common/src/main/resources/minions/collector.yml @@ -22,7 +22,7 @@ item: - "" - "<#FFEE00>Statistics" - " <#FFEE00>❙ Level: <#FFEEAA>" - - " <#FFEE00>❙ Collected items: <#FFEEAA>" + - " <#FFEE00>❙ Items collected: <#FFEEAA>" - "" - "<#FFEE00>(!) Place the minion and give it a shovel!" @@ -46,7 +46,7 @@ gui: name: "<#FFEE00>Statistics" lore: - "" - - " - Collected items: <#FFEE00>" + - " - Items collected: <#FFEE00>" - "" upgrades: @@ -59,15 +59,15 @@ upgrades: texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2UzZDM2MzVjZTQxMWFiZjFlNGYzNzNkMTYxZDA3YjhjNDdlMzU5YjZjNTZmNzRiNDEzY2I0OTRhYzc0NmUyZCJ9fX0=" chestplate: type: "leather_chestplate" - color: "255, 230, 0" + color: "255, 255, 0" glow: false leggings: type: "leather_leggings" - color: "255, 230, 0" + color: "255, 255, 0" glow: false boots: type: "leather_boots" - color: "255, 230, 0" + color: "255, 255, 0" glow: false 2: range: 3 diff --git a/common/src/main/resources/minions/crafter.yml b/common/src/main/resources/minions/crafter.yml index fc2d1b1..c558668 100644 --- a/common/src/main/resources/minions/crafter.yml +++ b/common/src/main/resources/minions/crafter.yml @@ -6,9 +6,10 @@ entity: tool: material: - "*" + item: type: "player_head" - texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2UzZDM2MzVjZTQxMWFiZjFlNGYzNzNkMTYxZDA3YjhjNDdlMzU5YjZjNTZmNzRiNDEzY2I0OTRhYzc0NmUyZCJ9fX0=" + texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmNkYzBmZWI3MDAxZTJjMTBmZDUwNjZlNTAxYjg3ZTNkNjQ3OTMwOTJiODVhNTBjODU2ZDk2MmY4YmU5MmM3OCJ9fX0=" name: "<#FFEE00>Crafter Minion" lore: - "" @@ -16,7 +17,7 @@ item: - "" - "<#FFEE00>Statistics" - " <#FFEE00>❙ Level: <#FFEEAA>" - - " <#FFEE00>❙ Collected items: <#FFEEAA>" + - " <#FFEE00>❙ Crafted items: <#FFEEAA>" - "" - "<#FFEE00>(!) Place the minion and give it an item to craft!" @@ -32,7 +33,7 @@ gui: - "" - "<#00CCFF>Requirements:" - " - Money: <#33FF33>$" - - " - Collected items: <#33FF33>" + - " - Crafted items: <#33FF33>" - "" - "<#00CCFF>(!) Click here to upgrade your minion!" statistics: @@ -49,20 +50,21 @@ upgrades: items: helmet: type: "player_head" - texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2UzZDM2MzVjZTQxMWFiZjFlNGYzNzNkMTYxZDA3YjhjNDdlMzU5YjZjNTZmNzRiNDEzY2I0OTRhYzc0NmUyZCJ9fX0=" + texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmNkYzBmZWI3MDAxZTJjMTBmZDUwNjZlNTAxYjg3ZTNkNjQ3OTMwOTJiODVhNTBjODU2ZDk2MmY4YmU5MmM3OCJ9fX0=" chestplate: type: "leather_chestplate" - color: "255, 230, 0" + color: "125, 75, 30" glow: false leggings: type: "leather_leggings" - color: "255, 230, 0" + color: "125, 75, 30" glow: false boots: type: "leather_boots" - color: "255, 230, 0" + color: "125, 75, 30" glow: false 2: + speed: 150 requirements: money: 1000 actions: 100 @@ -72,6 +74,7 @@ upgrades: money: 3000 actions: 300 4: + speed: 130 requirements: money: 10000 actions: 1000 @@ -81,6 +84,7 @@ upgrades: money: 20000 actions: 3000 6: + speed: 110 requirements: money: 50000 actions: 6000 @@ -90,6 +94,7 @@ upgrades: money: 150000 actions: 10000 8: + speed: 95 requirements: money: 500000 actions: 17500 @@ -106,13 +111,13 @@ upgrades: items: chestplate: type: LEATHER_CHESTPLATE - color: "255, 200, 0" + color: "100, 70, 30" glow: true leggings: type: LEATHER_LEGGINGS - color: "255, 200, 0" + color: "100, 70, 30" glow: true boots: type: LEATHER_BOOTS - color: "255, 200, 0" + color: "100, 70, 30" glow: true \ No newline at end of file diff --git a/common/src/main/resources/minions/farmer.yml b/common/src/main/resources/minions/farmer.yml index 684fa6e..7c59212 100644 --- a/common/src/main/resources/minions/farmer.yml +++ b/common/src/main/resources/minions/farmer.yml @@ -22,7 +22,7 @@ item: - "" - "<#33FF33>Statistics" - " <#33FF33>❙ Level: <#AAFFAA>" - - " <#33FF33>❙ Harvested crops: <#AAFFAA>" + - " <#33FF33>❙ Crops harvested: <#AAFFAA>" - "" - "<#33FF33>(!) Place the minion and give it a hoe!" @@ -59,15 +59,15 @@ upgrades: texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDAxZTAzNWEzZDhkNjEyNjA3MmJjYmU1MmE5NzkxM2FjZTkzNTUyYTk5OTk1YjVkNDA3MGQ2NzgzYTMxZTkwOSJ9fX0=" chestplate: type: "leather_chestplate" - color: "50, 255, 50" + color: "0, 255, 0" glow: false leggings: type: "leather_leggings" - color: "50, 255, 50" + color: "0, 255, 0" glow: false boots: type: "leather_boots" - color: "50, 255, 50" + color: "0, 255, 0" glow: false 2: range: 2.5 @@ -126,13 +126,13 @@ upgrades: items: chestplate: type: LEATHER_CHESTPLATE - color: "50, 225, 50" + color: "0, 200, 0" glow: true leggings: type: LEATHER_LEGGINGS - color: "50, 225, 50" + color: "0, 200, 0" glow: true boots: type: LEATHER_BOOTS - color: "50, 225, 50" + color: "0, 200, 0" glow: true \ No newline at end of file diff --git a/common/src/main/resources/minions/fisher.yml b/common/src/main/resources/minions/fisher.yml index 7b3e7df..ee79f11 100644 --- a/common/src/main/resources/minions/fisher.yml +++ b/common/src/main/resources/minions/fisher.yml @@ -54,15 +54,15 @@ upgrades: texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYWMxNWU1ZmI1NmZhMTZiMDc0N2IxYmNiMDUzMzVmNTVkMWZhMzE1NjFjMDgyYjVlMzY0M2RiNTU2NTQxMDg1MiJ9fX0=" chestplate: type: "leather_chestplate" - color: "0, 150, 255" + color: "0, 255, 255" glow: false leggings: type: "leather_leggings" - color: "0, 150, 255" + color: "0, 255, 255" glow: false boots: type: "leather_boots" - color: "0, 150, 255" + color: "0, 255, 255" glow: false 2: range: 4 @@ -121,13 +121,13 @@ upgrades: items: chestplate: type: LEATHER_CHESTPLATE - color: "255, 200, 0" + color: "0, 200, 200" glow: true leggings: type: LEATHER_LEGGINGS - color: "255, 200, 0" + color: "0, 200, 200" glow: true boots: type: LEATHER_BOOTS - color: "255, 200, 0" + color: "0, 200, 200" glow: true \ No newline at end of file diff --git a/common/src/main/resources/minions/lumber.yml b/common/src/main/resources/minions/lumber.yml index 693d4f2..0037405 100644 --- a/common/src/main/resources/minions/lumber.yml +++ b/common/src/main/resources/minions/lumber.yml @@ -14,7 +14,7 @@ tool: item: type: "player_head" - texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzk2MjdiZTYyY2VkNzE0MTEzOWQzZjE1NTc5MGE1ZDQzNTZlYjdiOWVlOTVlNTA0YjMzMjI5NzRjYmM1MTVlYSJ9fX0=" + texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmNjMGE5MTk5MGU3NmM2ZDY1ODA1MGI3YWM3ZTQ4MmJjNTgyYjI0NTg5YmI3ZjE0NmJkMWMwM2I5Yzg0Y2RkOSJ9fX0=" name: "<#00AAFF>Lumberjack Minion" lore: - "" @@ -56,18 +56,18 @@ upgrades: items: helmet: type: "player_head" - texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzk2MjdiZTYyY2VkNzE0MTEzOWQzZjE1NTc5MGE1ZDQzNTZlYjdiOWVlOTVlNTA0YjMzMjI5NzRjYmM1MTVlYSJ9fX0=" + texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmNjMGE5MTk5MGU3NmM2ZDY1ODA1MGI3YWM3ZTQ4MmJjNTgyYjI0NTg5YmI3ZjE0NmJkMWMwM2I5Yzg0Y2RkOSJ9fX0=" chestplate: type: "leather_chestplate" - color: "0, 150, 255" + color: "0, 200, 255" glow: false leggings: type: "leather_leggings" - color: "0, 150, 255" + color: "0, 200, 255" glow: false boots: type: "leather_boots" - color: "0, 150, 255" + color: "0, 200, 255" glow: false 2: range: 4 @@ -126,13 +126,13 @@ upgrades: items: chestplate: type: LEATHER_CHESTPLATE - color: "255, 200, 0" + color: "0, 150, 200" glow: true leggings: type: LEATHER_LEGGINGS - color: "255, 200, 0" + color: "0, 150, 200" glow: true boots: type: LEATHER_BOOTS - color: "255, 200, 0" + color: "0, 150, 200" glow: true \ No newline at end of file diff --git a/common/src/main/resources/minions/miner.yml b/common/src/main/resources/minions/miner.yml index e71bd92..f3bdee0 100644 --- a/common/src/main/resources/minions/miner.yml +++ b/common/src/main/resources/minions/miner.yml @@ -31,7 +31,7 @@ item: - "" - "<#00AAFF>Statistics" - " <#00AAFF>❙ Level: <#FFEEAA>" - - " <#00AAFF>❙ Broken blocks: <#FFEEAA>" + - " <#00AAFF>❙ Blocks broken: <#FFEEAA>" - "" - "<#00AAFF>(!) Place the minion and give it a pickaxe!" @@ -47,7 +47,7 @@ gui: - "" - "<#00CCFF>Requirements:" - " - Money: <#33FF33>$" - - " - Collected items: <#33FF33>" + - " - Blocks broken: <#33FF33>" - "" - "<#00CCFF>(!) Click here to upgrade your minion!" statistics: @@ -55,7 +55,7 @@ gui: name: "<#00AAFF>Statistics" lore: - "" - - " - Broken blocks: <#00AAFF>" + - " - Blocks broken: <#00AAFF>" - "" upgrades: @@ -68,15 +68,15 @@ upgrades: texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzk2MjdiZTYyY2VkNzE0MTEzOWQzZjE1NTc5MGE1ZDQzNTZlYjdiOWVlOTVlNTA0YjMzMjI5NzRjYmM1MTVlYSJ9fX0=" chestplate: type: "leather_chestplate" - color: "0, 150, 255" + color: "200, 200, 200" glow: false leggings: type: "leather_leggings" - color: "0, 150, 255" + color: "200, 200, 200" glow: false boots: type: "leather_boots" - color: "0, 150, 255" + color: "200, 200, 200" glow: false 2: range: 3 @@ -135,13 +135,13 @@ upgrades: items: chestplate: type: LEATHER_CHESTPLATE - color: "255, 200, 0" + color: "150, 150, 150" glow: true leggings: type: LEATHER_LEGGINGS - color: "255, 200, 0" + color: "150, 150, 150" glow: true boots: type: LEATHER_BOOTS - color: "255, 200, 0" + color: "150, 150, 150" glow: true \ No newline at end of file diff --git a/common/src/main/resources/minions/seller.yml b/common/src/main/resources/minions/seller.yml index a7a0ca5..12a24a9 100644 --- a/common/src/main/resources/minions/seller.yml +++ b/common/src/main/resources/minions/seller.yml @@ -20,7 +20,7 @@ item: - "" - "<#CC00FF>Statistics" - " <#CC00FF>❙ Level: <#FFEEAA>" - - " <#CC00FF>❙ Sold items: <#FFEEAA>" + - " <#CC00FF>❙ Items sold: <#FFEEAA>" - "" - "<#CC00FF>(!) Place the minion and give it a bow!" @@ -36,7 +36,7 @@ gui: - "" - "<#00CCFF>Requirements:" - " - Money: <#33FF33>$" - - " - Sold items: <#33FF33>" + - " - Items sold: <#33FF33>" - "" - "<#00CCFF>(!) Click here to upgrade your minion!" statistics: @@ -44,7 +44,7 @@ gui: name: "<#CC00FF>Statistics" lore: - "" - - " - Collected items: <#CC00FF>" + - " - Items sold: <#CC00FF>" - " - Stored coins: <#CC00FF>" - "" - "<#CC00FF>(!) Click here to collect the stored coins!" @@ -64,11 +64,11 @@ upgrades: glow: false leggings: type: "leather_leggings" - color: "255, 230, 0" + color: "200, 0, 255" glow: false boots: type: "leather_boots" - color: "255, 230, 0" + color: "200, 0, 255" glow: false 2: multiplier: 1.05 @@ -136,13 +136,13 @@ upgrades: items: chestplate: type: LEATHER_CHESTPLATE - color: "255, 200, 0" + color: "150, 0, 200" glow: true leggings: type: LEATHER_LEGGINGS - color: "255, 200, 0" + color: "150, 0, 200" glow: true boots: type: LEATHER_BOOTS - color: "255, 200, 0" + color: "150, 0, 200" glow: true \ No newline at end of file diff --git a/common/src/main/resources/minions/slayer.yml b/common/src/main/resources/minions/slayer.yml index 86fab72..35bcb2a 100644 --- a/common/src/main/resources/minions/slayer.yml +++ b/common/src/main/resources/minions/slayer.yml @@ -42,7 +42,7 @@ gui: - "" - "<#00CCFF>Requirements:" - " - Money: <#33FF33>$" - - " - Killed mobs: <#33FF33>" + - " - Mobs killed: <#33FF33>" - "" - "<#00CCFF>(!) Click here to upgrade your minion!" statistics: @@ -50,22 +50,9 @@ gui: name: "<#FF3333>Statistics" lore: - "" - - " - Killed mobs: <#FF3333>" + - " - Mobs killed: <#FF3333>" - " - Stored exp: <#CC00FF>" - "" - autosmelt: - enabled: true - slot: 9 - material: "lava_bucket" - name: "Autosmelt" - lore: - - "" - - " Click to purchase! " - - "" - - "Price: $1,000" - requirements: - money: 1000 - actions: 100 upgrades: 1: @@ -75,18 +62,18 @@ upgrades: items: helmet: type: "player_head" - texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI 6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTc1MzJlOTBjNTczYTM5NGM3ODAyYWE0MTU4MzA1ODAyYjU5ZTY3ZjJhMmI3ZTNmZDAzNjNhYTZlYTQyYjg0MSJ9fX0=" + texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTc1MzJlOTBjNTczYTM5NGM3ODAyYWE0MTU4MzA1ODAyYjU5ZTY3ZjJhMmI3ZTNmZDAzNjNhYTZlYTQyYjg0MSJ9fX0=" chestplate: type: "leather_chestplate" - color: "0, 150, 255" + color: "255, 0, 0" glow: false leggings: type: "leather_leggings" - color: "0, 150, 255" + color: "255, 0, 0" glow: false boots: type: "leather_boots" - color: "0, 150, 255" + color: "255, 0, 0" glow: false 2: range: 4 @@ -145,13 +132,13 @@ upgrades: items: chestplate: type: LEATHER_CHESTPLATE - color: "255, 200, 0" + color: "200, 0, 0" glow: true leggings: type: LEATHER_LEGGINGS - color: "255, 200, 0" + color: "200, 0, 0" glow: true boots: type: LEATHER_BOOTS - color: "255, 200, 0" + color: "200, 0, 0" glow: true \ No newline at end of file