diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 4dca0d887..1efac9ff8 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban. ### 4. Permanent Ban **Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an +standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals. **Consequence**: A permanent ban from any sort of public interaction within diff --git a/commons/src/main/java/net/swofty/commons/item/attribute/attributes/ItemAttributeHotPotatoBookData.java b/commons/src/main/java/net/swofty/commons/item/attribute/attributes/ItemAttributeHotPotatoBookData.java index 095d56cde..2c91ad1dd 100644 --- a/commons/src/main/java/net/swofty/commons/item/attribute/attributes/ItemAttributeHotPotatoBookData.java +++ b/commons/src/main/java/net/swofty/commons/item/attribute/attributes/ItemAttributeHotPotatoBookData.java @@ -9,7 +9,6 @@ import net.swofty.commons.item.attribute.ItemAttribute; import net.swofty.commons.statistics.ItemStatistics; import org.jetbrains.annotations.Nullable; - import org.json.JSONArray; import org.json.JSONObject; @@ -89,7 +88,7 @@ public static class HotPotatoBookData { public void addAmount(ItemType itemType, int amount) { if (!appliedItems.containsKey(itemType)) { appliedItems.put(itemType, amount); - }else{ + } else { appliedItems.put(itemType, appliedItems.get(itemType) + amount); } } diff --git a/configuration/SkyBlockPack/assets/minecraft/models/block/scaffolding_unstable.json b/configuration/SkyBlockPack/assets/minecraft/models/block/scaffolding_unstable.json index f5d64e3cd..0157898c0 100644 --- a/configuration/SkyBlockPack/assets/minecraft/models/block/scaffolding_unstable.json +++ b/configuration/SkyBlockPack/assets/minecraft/models/block/scaffolding_unstable.json @@ -107,7 +107,7 @@ "from": [2, 0, 0], "to": [14, 2, 2], "faces": { - "north": { "texture": "#side", "uv": [2, 0, 14, 2] , "cullface": "north" }, + "north": { "texture": "#side", "uv": [2, 0, 14, 2], "cullface": "north" }, "south": { "texture": "#side", "uv": [2, 2, 14, 4] }, "down": { "texture": "#bottom", "cullface": "bottom" } } @@ -117,7 +117,7 @@ "to": [14, 2, 16], "faces": { "north": { "texture": "#side", "uv": [14, 0, 2, 2] }, - "south": { "texture": "#side", "uv": [2, 0, 14, 2] , "cullface": "south" }, + "south": { "texture": "#side", "uv": [2, 0, 14, 2], "cullface": "south" }, "down": { "texture": "#bottom", "cullface": "bottom" } } }, diff --git a/configuration/SkyBlockPack/assets/minecraft/models/block/small_dripleaf_top.json b/configuration/SkyBlockPack/assets/minecraft/models/block/small_dripleaf_top.json index c9e2929cd..754d85e76 100644 --- a/configuration/SkyBlockPack/assets/minecraft/models/block/small_dripleaf_top.json +++ b/configuration/SkyBlockPack/assets/minecraft/models/block/small_dripleaf_top.json @@ -27,8 +27,8 @@ "to": [ 8, 12, 15 ], "shade": false, "faces": { - "down": { "uv": [ 8, 0, 0, 8 ], "texture": "#top" , "rotation": 270}, - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#top" , "rotation": 270} + "down": { "uv": [ 8, 0, 0, 8 ], "texture": "#top", "rotation": 270}, + "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#top", "rotation": 270} } }, { "from": [ 8, 2, 8 ], diff --git a/configuration/SkyBlockPack/assets/minecraft/models/item/tooting_goat_horn.json b/configuration/SkyBlockPack/assets/minecraft/models/item/tooting_goat_horn.json index c412562eb..fd0c0165d 100644 --- a/configuration/SkyBlockPack/assets/minecraft/models/item/tooting_goat_horn.json +++ b/configuration/SkyBlockPack/assets/minecraft/models/item/tooting_goat_horn.json @@ -20,7 +20,7 @@ }, "firstperson_lefthand": { "rotation": [ 0, 115, 5 ], - "translation": [ 0 , -2.5, -7.5 ] + "translation": [ 0, -2.5, -7.5 ] } } } diff --git a/configuration/SkyBlockPack/assets/minecraft/texts/splashes.txt b/configuration/SkyBlockPack/assets/minecraft/texts/splashes.txt index 0a90735dd..b5675381c 100644 --- a/configuration/SkyBlockPack/assets/minecraft/texts/splashes.txt +++ b/configuration/SkyBlockPack/assets/minecraft/texts/splashes.txt @@ -416,7 +416,7 @@ Stand up for equality in your community! [this splash text is now available] Contains simulated goats! Home-made! -There's < new Pos(0, 100 ,0), // Spawn position + (type) -> new Pos(0, 100, 0), // Spawn position true // Announce death messages ); } diff --git a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionCreateStarterChest.java b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionCreateStarterChest.java index 44e61dd88..9e08f97cc 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionCreateStarterChest.java +++ b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionCreateStarterChest.java @@ -12,18 +12,18 @@ public class ActionCreateStarterChest implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(IslandFirstCreatedEvent event) { MathUtility.delay(()->{ - new ChestBuilder(event.getIsland().getIslandInstance(), new Pos(3 , 93 , 30)) - .setItem(0 , ItemStack.of(Material.DIRT , 5)) - .setItem(1 , ItemStack.of(Material.GRASS_BLOCK , 7)) - .setItem(2 , ItemStack.of(Material.COBBLESTONE , 8)) - .setItem(3 , ItemStack.of(Material.WATER_BUCKET)) - .setItem(4 , ItemStack.of(Material.LAVA_BUCKET)) - .setItem(5 , ItemStack.of(Material.BONE_MEAL , 3)) + new ChestBuilder(event.getIsland().getIslandInstance(), new Pos(3, 93, 30)) + .setItem(0, ItemStack.of(Material.DIRT, 5)) + .setItem(1, ItemStack.of(Material.GRASS_BLOCK, 7)) + .setItem(2, ItemStack.of(Material.COBBLESTONE, 8)) + .setItem(3, ItemStack.of(Material.WATER_BUCKET)) + .setItem(4, ItemStack.of(Material.LAVA_BUCKET)) + .setItem(5, ItemStack.of(Material.BONE_MEAL, 3)) .build(); - } , 60); + }, 60); } } diff --git a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandCreatePortals.java b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandCreatePortals.java index 91f31cc72..0c64d8f74 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandCreatePortals.java +++ b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandCreatePortals.java @@ -9,7 +9,7 @@ public class ActionIslandCreatePortals implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(IslandFetchedFromDatabaseEvent event) { IslandPortal portal = new IslandPortal(0, -1, 100, 35); portal.setType(IslandPortal.PortalType.HUB); diff --git a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandInitJerry.java b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandInitJerry.java index 3851f185b..5feca26ba 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandInitJerry.java +++ b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandInitJerry.java @@ -10,7 +10,7 @@ public class ActionIslandInitJerry implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(IslandFirstCreatedEvent event) { event.getIsland().setJerryInformation( new JerryInformation(null, new Pos(2.5, 100, 24.5, 145, 0), null) diff --git a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandLoadJerry.java b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandLoadJerry.java index b17bb07a7..252d7783a 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandLoadJerry.java +++ b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandLoadJerry.java @@ -15,7 +15,7 @@ public class ActionIslandLoadJerry implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(IslandFetchedFromDatabaseEvent event) { Document document = event.getIsland().getDatabase().getDocument(); JerryInformation jerryInformation = event.getIsland().getJerryInformation(); diff --git a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandLoadMinions.java b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandLoadMinions.java index ce5f27a38..e84385f33 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandLoadMinions.java +++ b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandLoadMinions.java @@ -19,7 +19,7 @@ public class ActionIslandLoadMinions implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(IslandFetchedFromDatabaseEvent event) { Document document = event.getIsland().getDatabase().getDocument(); diff --git a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandSaveJerry.java b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandSaveJerry.java index 7a3b5ca4d..b212e8df7 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandSaveJerry.java +++ b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandSaveJerry.java @@ -8,7 +8,7 @@ public class ActionIslandSaveJerry implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(IslandSavedIntoDatabaseEvent event) { JerryInformation jerryInformation = event.getIsland().getJerryInformation(); diff --git a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandSaveMinions.java b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandSaveMinions.java index 7e2dc2151..1b7573206 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandSaveMinions.java +++ b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionIslandSaveMinions.java @@ -8,7 +8,7 @@ public class ActionIslandSaveMinions implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM ,requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(IslandSavedIntoDatabaseEvent event) { IslandMinionData minionData = event.getIsland().getMinionData(); minionData.getMinions().forEach(IslandMinionData.IslandMinion::removeMinion); diff --git a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionPlayerSpawnFirstMinion.java b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionPlayerSpawnFirstMinion.java index d6c414a17..2dd7645af 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/custom/ActionPlayerSpawnFirstMinion.java +++ b/type.island/src/main/java/net/swofty/type/island/events/custom/ActionPlayerSpawnFirstMinion.java @@ -12,7 +12,7 @@ public class ActionPlayerSpawnFirstMinion implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(IslandFirstCreatedEvent event) { MathUtility.delay(() -> { IslandMinionData.IslandMinion minion = event.getIsland().getMinionData().initializeMinion( diff --git a/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerClickMinion.java b/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerClickMinion.java index 58a5bfda5..6ec6b6844 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerClickMinion.java +++ b/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerClickMinion.java @@ -11,7 +11,7 @@ public class ActionPlayerClickMinion implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerEntityInteractEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerClickedJerryNPC.java b/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerClickedJerryNPC.java index f8c704a85..8635407ed 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerClickedJerryNPC.java +++ b/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerClickedJerryNPC.java @@ -8,12 +8,12 @@ import net.swofty.type.generic.event.HypixelEventClass; import net.swofty.type.generic.event.HypixelEventHandler; import net.swofty.type.island.gui.GUIJerry; -import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import net.swofty.type.skyblockgeneric.event.custom.JerryClickedEvent; +import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class ActionPlayerClickedJerryNPC implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerEntityInteractEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerJoin.java b/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerJoin.java index 7b571f88f..d939d6cd3 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerJoin.java +++ b/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionPlayerJoin.java @@ -12,7 +12,7 @@ public class ActionPlayerJoin implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(AsyncPlayerConfigurationEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); event.setSpawningInstance(HypixelConst.getEmptyInstance()); diff --git a/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionStartIslandMission.java b/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionStartIslandMission.java index 260da8ecc..042c4a1a5 100644 --- a/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionStartIslandMission.java +++ b/type.island/src/main/java/net/swofty/type/island/events/traditional/ActionStartIslandMission.java @@ -10,7 +10,7 @@ public class ActionStartIslandMission implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(AsyncPlayerConfigurationEvent event) { MissionData data = ((SkyBlockPlayer) event.getPlayer()).getMissionData(); diff --git a/type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPlayerChat.java b/type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPlayerChat.java index 9dcf9db20..07e1d92f3 100644 --- a/type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPlayerChat.java +++ b/type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPlayerChat.java @@ -1,24 +1,22 @@ package net.swofty.type.prototypelobby.events; import net.minestom.server.event.player.PlayerChatEvent; -import net.swofty.commons.ServerType; import net.swofty.commons.StringUtility; -import net.swofty.type.generic.HypixelConst; import net.swofty.type.generic.HypixelGenericLoader; import net.swofty.type.generic.data.HypixelDataHandler; import net.swofty.type.generic.data.datapoints.DatapointChatType; -import net.swofty.type.generic.data.datapoints.DatapointToggles; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; import net.swofty.type.generic.party.PartyManager; import net.swofty.type.generic.user.HypixelPlayer; import net.swofty.type.generic.user.categories.Rank; + import java.util.List; public class ActionPlayerChat implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(PlayerChatEvent event) { final HypixelPlayer player = (HypixelPlayer) event.getPlayer(); event.setCancelled(true); diff --git a/type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPlayerJoin.java b/type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPlayerJoin.java index 6a4b343aa..6f67e73b6 100644 --- a/type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPlayerJoin.java +++ b/type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPlayerJoin.java @@ -12,7 +12,7 @@ public class ActionPlayerJoin implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(AsyncPlayerConfigurationEvent event) { final HypixelPlayer player = (HypixelPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/block/blocks/BlockChest.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/block/blocks/BlockChest.java index ffb6538da..949b09b4f 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/block/blocks/BlockChest.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/block/blocks/BlockChest.java @@ -10,6 +10,7 @@ import net.minestom.server.item.ItemStack; import net.minestom.server.sound.SoundEvent; import net.swofty.type.generic.HypixelConst; +import net.swofty.type.generic.utility.ChestUtility; import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; import net.swofty.type.skyblockgeneric.block.impl.BlockBreakable; import net.swofty.type.skyblockgeneric.block.impl.BlockInteractable; @@ -17,7 +18,6 @@ import net.swofty.type.skyblockgeneric.chest.*; import net.swofty.type.skyblockgeneric.gui.inventories.GUIChest; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; -import net.swofty.type.generic.utility.ChestUtility; import java.util.List; @@ -57,7 +57,7 @@ public void onInteract(PlayerBlockInteractEvent event, SkyBlockBlock block) { chest = new SingleChest(instance, position); } - ChestAnimationType.OPEN.play(chest.getInstance() , chest.getPosition()); + ChestAnimationType.OPEN.play(chest.getInstance(), chest.getPosition()); player.playSound(Sound.sound(SoundEvent.BLOCK_CHEST_OPEN, Sound.Source.RECORD, 1f, 1f)); new GUIChest(chest).open(player); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/block/impl/BlockPlaceable.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/block/impl/BlockPlaceable.java index f8da44743..aa4925cb1 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/block/impl/BlockPlaceable.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/block/impl/BlockPlaceable.java @@ -5,5 +5,5 @@ public interface BlockPlaceable { - void onPlace(PlayerBlockPlaceEvent event , SkyBlockBlock block); + void onPlace(PlayerBlockPlaceEvent event, SkyBlockBlock block); } diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestAnimationType.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestAnimationType.java index 308a48d0d..c3b9b1ffb 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestAnimationType.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestAnimationType.java @@ -10,7 +10,7 @@ public enum ChestAnimationType { OPEN, CLOSE; - public void play(Instance instance , Point[] positions) { + public void play(Instance instance, Point[] positions) { Arrays.stream(positions).forEach((position) -> { BlockActionPacket actionPacket = new BlockActionPacket( position, diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestBuilder.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestBuilder.java index 1c458d787..69e3db63d 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestBuilder.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestBuilder.java @@ -3,9 +3,9 @@ import net.minestom.server.coordinate.Point; import net.minestom.server.instance.Instance; import net.minestom.server.item.ItemStack; +import net.swofty.type.generic.utility.ChestUtility; import net.swofty.type.skyblockgeneric.block.BlockType; import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; -import net.swofty.type.generic.utility.ChestUtility; public class ChestBuilder { @@ -26,7 +26,7 @@ public ChestBuilder(Instance instance, Point position) { public Chest build() { if (!instance.getBlock(position).name().equals("minecraft:chest") || !SkyBlockBlock.isSkyBlockBlock(instance.getBlock(position))) - instance.setBlock(position , new SkyBlockBlock(BlockType.CHEST).toBlock()); + instance.setBlock(position, new SkyBlockBlock(BlockType.CHEST).toBlock()); if (chestType == ChestType.SINGLE) { return new SingleChest(instance, position); } else if (chestType == ChestType.DOUBLE) { diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestType.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestType.java index b0630bfae..a119ecdc5 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestType.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/ChestType.java @@ -9,7 +9,7 @@ public enum ChestType { SINGLE, DOUBLE; - public static ChestType from(Instance instance , Point position) { + public static ChestType from(Instance instance, Point position) { for (BlockFace face : BlockFace.values()) { Block adjacent = instance.getBlock(position.add(face.toDirection().normalX(), face.toDirection().normalY(), face.toDirection().normalZ())); if (adjacent.name().equals("minecraft:chest")) { diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/DoubleChest.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/DoubleChest.java index 56ff6d0e7..e8bc2f45b 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/DoubleChest.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/chest/DoubleChest.java @@ -71,8 +71,8 @@ private void save(Point position, ItemStack[] itemStacks) { @Override public void update() { - save(leftPosition , leftItems); - save(rightPosition , rightItems); + save(leftPosition, leftItems); + save(rightPosition, rightItems); } @Override diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointCollection.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointCollection.java index 1751b9c5b..609f9696a 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointCollection.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointCollection.java @@ -104,7 +104,7 @@ public List getDisplay(List lore) { String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); @@ -135,7 +135,7 @@ public List getDisplay(List lore, CollectionCategory.ItemCollect String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); @@ -168,7 +168,7 @@ public List getDisplay(List lore, CollectionCategory.ItemCollect String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); @@ -200,7 +200,7 @@ public List getDisplay(List lore, CollectionCategory category) { String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointCompletedBazaarTransactions.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointCompletedBazaarTransactions.java index b295ca5fe..aa777a721 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointCompletedBazaarTransactions.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointCompletedBazaarTransactions.java @@ -267,9 +267,9 @@ public static CompletedBazaarTransaction createSellTransaction( itemName, quantity, pricePerUnit, - taxTaken, // Tax stored in secondaryAmount - 0, // No original bid for sell orders - orderId, // Related order ID needed for sells + taxTaken, // Tax stored in secondaryAmount + 0, // No original bid for sell orders + orderId, // Related order ID needed for sells Instant.now(), false ); @@ -284,10 +284,10 @@ public static CompletedBazaarTransaction createExpiredBuyOrder( TransactionType.BUY_ORDER_EXPIRED, itemName, quantity, - originalPricePerUnit, // Store original price per unit for display - totalRefund, // Total refund amount in secondaryAmount - originalPricePerUnit, // Store original bid price - orderId, // Link to the expired order + originalPricePerUnit, // Store original price per unit for display + totalRefund, // Total refund amount in secondaryAmount + originalPricePerUnit, // Store original bid price + orderId, // Link to the expired order Instant.now(), false ); @@ -301,10 +301,10 @@ public static CompletedBazaarTransaction createExpiredSellOrder( TransactionType.SELL_ORDER_EXPIRED, itemName, quantity, - 0.0, // No price for returned items - 0.0, // No secondary amount - 0.0, // No original bid - orderId, // Link to the expired order + 0.0, // No price for returned items + 0.0, // No secondary amount + 0.0, // No original bid + orderId, // Link to the expired order Instant.now(), false ); @@ -357,9 +357,9 @@ public boolean givesCoins() { } public enum TransactionType { - BUY_COMPLETED, // Player bought items (receive items) - SELL_COMPLETED, // Player sold items (receive coins) - BUY_ORDER_EXPIRED, // Buy order expired (receive coin refund) + BUY_COMPLETED, // Player bought items (receive items) + SELL_COMPLETED, // Player sold items (receive coins) + BUY_ORDER_EXPIRED, // Buy order expired (receive coin refund) SELL_ORDER_EXPIRED, // Sell order expired (receive items back) REFUND // For price improvement refunds } diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointSkills.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointSkills.java index 2060f05fd..e237cf45d 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointSkills.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointSkills.java @@ -7,8 +7,8 @@ import net.swofty.commons.StringUtility; import net.swofty.commons.protocol.Serializer; import net.swofty.commons.statistics.ItemStatistics; -import net.swofty.type.skyblockgeneric.data.SkyBlockDatapoint; import net.swofty.type.generic.event.HypixelEventHandler; +import net.swofty.type.skyblockgeneric.data.SkyBlockDatapoint; import net.swofty.type.skyblockgeneric.event.custom.SkillUpdateEvent; import net.swofty.type.skyblockgeneric.skill.SkillCategories; import net.swofty.type.skyblockgeneric.skill.SkillCategory; @@ -246,7 +246,7 @@ public List getDisplay(List lore, SkillCategories category, doub String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointSkyBlockExperience.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointSkyBlockExperience.java index 082e6194d..4ff627bfe 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointSkyBlockExperience.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointSkyBlockExperience.java @@ -5,8 +5,8 @@ import lombok.NonNull; import lombok.Setter; import net.swofty.commons.protocol.Serializer; -import net.swofty.type.skyblockgeneric.data.SkyBlockDatapoint; import net.swofty.type.generic.event.HypixelEventHandler; +import net.swofty.type.skyblockgeneric.data.SkyBlockDatapoint; import net.swofty.type.skyblockgeneric.event.custom.SkyBlockXPModificationEvent; import net.swofty.type.skyblockgeneric.levels.SkyBlockEmblems; import net.swofty.type.skyblockgeneric.levels.SkyBlockLevelCause; @@ -163,7 +163,7 @@ public String getNextLevelDisplay() { String completedLoadingBar = "§3§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§f§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/DecorationEntityImpl.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/DecorationEntityImpl.java index 357881bb4..2b89d1b98 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/DecorationEntityImpl.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/entity/DecorationEntityImpl.java @@ -28,6 +28,6 @@ public DecorationEntityImpl(SkyBlockItem item, SkyBlockPlayer player) { } public void spawn(Instance instance, Point pos) { - this.setInstance(instance , pos.sub(0, 1.46875, 0)); + this.setInstance(instance, pos.sub(0, 1.46875, 0)); } } diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionChangeMiningRegion.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionChangeMiningRegion.java index 057f7ec30..2098c466e 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionChangeMiningRegion.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionChangeMiningRegion.java @@ -9,7 +9,7 @@ import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class ActionChangeMiningRegion implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(PlayerRegionChangeEvent event) { SkyBlockPlayer player = event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionChangeTimeCalender.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionChangeTimeCalender.java index 6f36af92c..f7b0df482 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionChangeTimeCalender.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionChangeTimeCalender.java @@ -1,13 +1,13 @@ package net.swofty.type.skyblockgeneric.event.actions.custom; -import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader; import net.swofty.type.skyblockgeneric.event.custom.CalenderHourlyUpdateEvent; public class ActionChangeTimeCalender implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(CalenderHourlyUpdateEvent event) { long time = (event.getHour() * 1000L); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionDisplayMenu.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionDisplayMenu.java index a9746f1a0..6ce7d9516 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionDisplayMenu.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionDisplayMenu.java @@ -8,7 +8,7 @@ import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class ActionDisplayMenu implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(HypixelInventoryGUI.InventoryGUIOpenEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.player(); ActionPlayerChangeHypixelMenuDisplay.setMainMenu(player); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionNewZoneDisplay.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionNewZoneDisplay.java index 6a1819143..f7954b5b0 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionNewZoneDisplay.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionNewZoneDisplay.java @@ -18,7 +18,7 @@ public class ActionNewZoneDisplay implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(PlayerRegionChangeEvent event) { SkyBlockPlayer player = event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionPlayerDamageBlock.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionPlayerDamageBlock.java index 86592eba2..cba324943 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionPlayerDamageBlock.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionPlayerDamageBlock.java @@ -24,7 +24,7 @@ public class ActionPlayerDamageBlock implements HypixelEventClass { public static final Map CLICKING = new HashMap<>(); - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(PlayerDamageSkyBlockBlockEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); SkyBlockRegion region = SkyBlockRegion.getRegionOfPosition(event.getBlockPosition()); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionRegionChangeDisplay.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionRegionChangeDisplay.java index fdd6baaed..3b6ba1180 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionRegionChangeDisplay.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionRegionChangeDisplay.java @@ -9,7 +9,7 @@ public class ActionRegionChangeDisplay implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(PlayerRegionChangeEvent event) { SkyBlockPlayer player = event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionRegionPlaySong.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionRegionPlaySong.java index 2bb560326..7c5055543 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionRegionPlaySong.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionRegionPlaySong.java @@ -16,7 +16,7 @@ public class ActionRegionPlaySong implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false , isAsync = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false, isAsync = true) public void run(PlayerRegionChangeEvent event) { SkyBlockPlayer player = event.getPlayer(); SkyBlockSongsHandler songHandler = player.getSongHandler(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionStartHubMission.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionStartHubMission.java index 7d6e68f05..d01d5fa12 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionStartHubMission.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/ActionStartHubMission.java @@ -10,7 +10,7 @@ public class ActionStartHubMission implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(PlayerRegionChangeEvent event) { if (event.getTo() == null) return; if (event.getTo() != RegionType.VILLAGE) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionAdd.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionAdd.java index 095886159..cfdd9abad 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionAdd.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionAdd.java @@ -3,25 +3,25 @@ import net.swofty.commons.StringUtility; import net.swofty.commons.item.ItemType; import net.swofty.proxyapi.ProxyPlayerSet; +import net.swofty.type.generic.event.EventNodes; +import net.swofty.type.generic.event.HypixelEvent; +import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.generic.event.HypixelEventHandler; +import net.swofty.type.generic.utility.MathUtility; import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader; import net.swofty.type.skyblockgeneric.collection.CollectionCategories; import net.swofty.type.skyblockgeneric.collection.CollectionCategory; import net.swofty.type.skyblockgeneric.data.datapoints.DatapointCollection; import net.swofty.type.skyblockgeneric.data.monogdb.CoopDatabase; -import net.swofty.type.generic.event.EventNodes; -import net.swofty.type.generic.event.HypixelEvent; -import net.swofty.type.generic.event.HypixelEventClass; -import net.swofty.type.generic.event.HypixelEventHandler; import net.swofty.type.skyblockgeneric.event.custom.CollectionUpdateEvent; import net.swofty.type.skyblockgeneric.event.custom.CustomBlockBreakEvent; import net.swofty.type.skyblockgeneric.user.SkyBlockActionBar; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; -import net.swofty.type.generic.utility.MathUtility; public class ActionCollectionAdd implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(CustomBlockBreakEvent event) { if (event.getPlayerPlaced()) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionDisplay.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionDisplay.java index 83c237f4e..cce3deccf 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionDisplay.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionDisplay.java @@ -4,11 +4,11 @@ import net.minestom.server.component.DataComponents; import net.minestom.server.item.ItemStack; import net.swofty.commons.StringUtility; -import net.swofty.type.skyblockgeneric.collection.CollectionCategories; -import net.swofty.type.skyblockgeneric.collection.CollectionCategory; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.collection.CollectionCategories; +import net.swofty.type.skyblockgeneric.collection.CollectionCategory; import net.swofty.type.skyblockgeneric.event.custom.CollectionUpdateEvent; import net.swofty.type.skyblockgeneric.item.updater.NonPlayerItemUpdater; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; @@ -18,7 +18,7 @@ public class ActionCollectionDisplay implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(CollectionUpdateEvent event) { if (event.getOldValue() == 0 && CollectionCategories.getCategory(event.getItemType()) != null) { diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionHypixelLevel.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionHypixelLevel.java index 5f6631aea..4a4c8f61f 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionHypixelLevel.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/collection/ActionCollectionHypixelLevel.java @@ -1,17 +1,17 @@ package net.swofty.type.skyblockgeneric.event.actions.custom.collection; -import net.swofty.type.skyblockgeneric.collection.CollectionCategories; -import net.swofty.type.skyblockgeneric.collection.CollectionCategory; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.collection.CollectionCategories; +import net.swofty.type.skyblockgeneric.collection.CollectionCategory; import net.swofty.type.skyblockgeneric.event.custom.CollectionUpdateEvent; import net.swofty.type.skyblockgeneric.levels.SkyBlockLevelCause; public class ActionCollectionHypixelLevel implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(CollectionUpdateEvent event) { if (CollectionCategories.getCategory(event.getItemType()) == null) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/levels/ActionChangeHypixelXP.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/levels/ActionChangeHypixelXP.java index 2b13cf9bc..e416fc50b 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/levels/ActionChangeHypixelXP.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/levels/ActionChangeHypixelXP.java @@ -15,7 +15,7 @@ public class ActionChangeHypixelXP implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(SkyBlockXPModificationEvent event) { if (event.getNewXP() <= event.getOldXP()) return; SkyBlockPlayer player = event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillDisplay.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillDisplay.java index c72a7d477..f91c62d4f 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillDisplay.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillDisplay.java @@ -9,7 +9,7 @@ public class ActionSkillDisplay implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(SkillUpdateEvent event) { double oldValue = event.getOldValueRaw(); double newValue = event.getNewValueRaw(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillHypixelLevel.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillHypixelLevel.java index 8b481a35f..c0036c6c4 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillHypixelLevel.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillHypixelLevel.java @@ -10,7 +10,7 @@ public class ActionSkillHypixelLevel implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(SkillUpdateEvent event) { if (event.getNewValueRaw() <= event.getOldValueRaw()) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillLevelUp.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillLevelUp.java index b3f3671e3..a1e5d4cc2 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillLevelUp.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillLevelUp.java @@ -17,7 +17,7 @@ public class ActionSkillLevelUp implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(SkillUpdateEvent event) { if (event.getNewValueRaw() <= event.getOldValueRaw()) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillMiningHandler.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillMiningHandler.java index b3bfaed92..a018d3a66 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillMiningHandler.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillMiningHandler.java @@ -1,9 +1,9 @@ package net.swofty.type.skyblockgeneric.event.actions.custom.skill; -import net.swofty.type.skyblockgeneric.data.datapoints.DatapointSkills; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.data.datapoints.DatapointSkills; import net.swofty.type.skyblockgeneric.event.custom.CustomBlockBreakEvent; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.item.components.SkillableMineComponent; @@ -11,7 +11,7 @@ public class ActionSkillMiningHandler implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(CustomBlockBreakEvent event) { if (event.getPlayerPlaced()) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillPetLevel.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillPetLevel.java index d38cf322f..b8d6783b2 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillPetLevel.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillPetLevel.java @@ -11,7 +11,7 @@ public class ActionSkillPetLevel implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = false) public void run(SkillUpdateEvent event) { if (event.getNewValueRaw() <= event.getOldValueRaw()) return; double xp = event.getNewValueRaw() - event.getOldValueRaw(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillUpdateLast.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillUpdateLast.java index 0032fca6e..48f832b7a 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillUpdateLast.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/custom/skill/ActionSkillUpdateLast.java @@ -1,14 +1,14 @@ package net.swofty.type.skyblockgeneric.event.actions.custom.skill; -import net.swofty.type.skyblockgeneric.data.datapoints.DatapointSkillCategory; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.data.datapoints.DatapointSkillCategory; import net.swofty.type.skyblockgeneric.event.custom.SkillUpdateEvent; public class ActionSkillUpdateLast implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(SkillUpdateEvent event) { double oldValue = event.getOldValueRaw(); double newValue = event.getNewValueRaw(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/entity/ActionAnimateEntityDamage.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/entity/ActionAnimateEntityDamage.java index d51967d2e..31730b2a4 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/entity/ActionAnimateEntityDamage.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/entity/ActionAnimateEntityDamage.java @@ -8,7 +8,7 @@ public class ActionAnimateEntityDamage implements HypixelEventClass { - @HypixelEvent(node = EventNodes.ENTITY , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.ENTITY, requireDataLoaded = false) public void run(EntityDamageEvent event) { event.setAnimation(true); event.setCancelled(false); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/entity/ActionChunkUnload.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/entity/ActionChunkUnload.java index acece589a..fb549b543 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/entity/ActionChunkUnload.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/entity/ActionChunkUnload.java @@ -9,7 +9,7 @@ public class ActionChunkUnload implements HypixelEventClass { - @HypixelEvent(node = EventNodes.ENTITY , requireDataLoaded = false , isAsync = true) + @HypixelEvent(node = EventNodes.ENTITY, requireDataLoaded = false, isAsync = true) public void run(InstanceChunkUnloadEvent event) { Instance instance = event.getInstance(); int chunkX = event.getChunkX(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityBlockLeftUse.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityBlockLeftUse.java index 79835416b..418aac1a9 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityBlockLeftUse.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityBlockLeftUse.java @@ -14,7 +14,7 @@ public class ActionItemAbilityBlockLeftUse implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerBlockBreakEvent event) { ItemStack itemStack = event.getPlayer().getItemInMainHand(); SkyBlockItem item = new SkyBlockItem(itemStack); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityBlockRightUse.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityBlockRightUse.java index 84ef4dea6..651bd1f2c 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityBlockRightUse.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityBlockRightUse.java @@ -14,7 +14,7 @@ public class ActionItemAbilityBlockRightUse implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerBlockInteractEvent event) { ItemStack itemStack = event.getPlayer().getItemInMainHand(); SkyBlockItem item = new SkyBlockItem(itemStack); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityLeftUse.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityLeftUse.java index 8f831a151..67a5ecb73 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityLeftUse.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityLeftUse.java @@ -15,7 +15,7 @@ public class ActionItemAbilityLeftUse implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerHandAnimationEvent event) { ItemStack itemStack = event.getPlayer().getItemInMainHand(); SkyBlockItem item = new SkyBlockItem(itemStack); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityRightUse.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityRightUse.java index 209fce1a6..a426c66ac 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityRightUse.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityRightUse.java @@ -16,7 +16,7 @@ public class ActionItemAbilityRightUse implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerUseItemEvent event) { ItemStack itemStack = event.getItemStack(); SkyBlockItem item = new SkyBlockItem(itemStack); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemDrop.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemDrop.java index 7c2256204..7f064cce1 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemDrop.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemDrop.java @@ -4,16 +4,16 @@ import net.minestom.server.coordinate.Pos; import net.minestom.server.event.item.ItemDropEvent; import net.swofty.type.generic.data.datapoints.DatapointToggles; -import net.swofty.type.skyblockgeneric.entity.DroppedItemEntityImpl; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.entity.DroppedItemEntityImpl; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class ActionItemDrop implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(ItemDropEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemLeftUse.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemLeftUse.java index a1ad4c1c1..65c8e9e3c 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemLeftUse.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemLeftUse.java @@ -13,7 +13,7 @@ public class ActionItemLeftUse implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerHandAnimationEvent event) { ItemStack itemStack = event.getPlayer().getItemInMainHand(); SkyBlockItem item = new SkyBlockItem(itemStack); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemPlace.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemPlace.java index da8500dc2..f63bed015 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemPlace.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemPlace.java @@ -3,10 +3,10 @@ import lombok.SneakyThrows; import net.minestom.server.event.player.PlayerBlockPlaceEvent; import net.minestom.server.item.ItemStack; -import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.item.components.PlaceEventComponent; import net.swofty.type.skyblockgeneric.item.components.PlaceableComponent; @@ -15,7 +15,7 @@ public class ActionItemPlace implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerBlockPlaceEvent event) { ItemStack itemStack = event.getPlayer().getItemInMainHand(); SkyBlockItem item = new SkyBlockItem(itemStack); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemRightUse.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemRightUse.java index dcc92103c..34381383c 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemRightUse.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemRightUse.java @@ -14,7 +14,7 @@ public class ActionItemRightUse implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerUseItemOnBlockEvent event) { ItemStack itemStack = event.getPlayer().getItemInMainHand(); SkyBlockItem item = new SkyBlockItem(itemStack); @@ -27,7 +27,7 @@ public void run(PlayerUseItemOnBlockEvent event) { } @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerUseItemEvent event) { ItemStack itemStack = event.getPlayer().getItemInMainHand(); SkyBlockItem item = new SkyBlockItem(itemStack); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionPlayerItemPickup.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionPlayerItemPickup.java index 91f8a1ed3..839f8e206 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionPlayerItemPickup.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionPlayerItemPickup.java @@ -3,15 +3,15 @@ import net.minestom.server.event.player.PlayerMoveEvent; import net.minestom.server.network.packet.server.play.CollectItemPacket; import net.swofty.commons.item.ItemType; -import net.swofty.type.skyblockgeneric.entity.DroppedItemEntityImpl; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.entity.DroppedItemEntityImpl; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class ActionPlayerItemPickup implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(PlayerMoveEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionUseBow.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionUseBow.java index a7b9a1f81..e749592c3 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionUseBow.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionUseBow.java @@ -10,7 +10,7 @@ public class ActionUseBow implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerFinishItemUseEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionUseShortBow.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionUseShortBow.java index 177c76ccd..6ecf8f2af 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionUseShortBow.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionUseShortBow.java @@ -11,7 +11,7 @@ public class ActionUseShortBow implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerBeginItemUseEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); ItemAnimation type = event.getAnimation(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionAddSkyBlockXPToNametag.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionAddSkyBlockXPToNametag.java index a4f6f109b..f1fa67fe7 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionAddSkyBlockXPToNametag.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionAddSkyBlockXPToNametag.java @@ -2,7 +2,6 @@ import net.kyori.adventure.text.Component; import net.minestom.server.MinecraftServer; -import net.minestom.server.event.player.PlayerBlockInteractEvent; import net.minestom.server.event.player.PlayerSpawnEvent; import net.minestom.server.scoreboard.Team; import net.minestom.server.scoreboard.TeamBuilder; @@ -12,12 +11,11 @@ import net.swofty.type.generic.user.categories.Rank; import net.swofty.type.generic.utility.MathUtility; import net.swofty.type.skyblockgeneric.data.datapoints.DatapointSkyBlockExperience; -import net.swofty.type.skyblockgeneric.gui.inventories.GUIAnvil; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class ActionAddSkyBlockXPToNametag implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerSpawnEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); if (!event.isFirstSpawn()) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionAnvilClick.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionAnvilClick.java index f8eef5b96..8773d41bb 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionAnvilClick.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionAnvilClick.java @@ -9,7 +9,7 @@ public class ActionAnvilClick implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerBlockInteractEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionClearPendingBazaar.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionClearPendingBazaar.java index f0f92ad7a..34018cfd5 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionClearPendingBazaar.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionClearPendingBazaar.java @@ -8,7 +8,7 @@ public class ActionClearPendingBazaar implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerSpawnEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); player.getBazaarConnector().processAllPendingTransactions(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionCraftingTableClick.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionCraftingTableClick.java index 92a8ccd75..35c8f415b 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionCraftingTableClick.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionCraftingTableClick.java @@ -11,7 +11,7 @@ public class ActionCraftingTableClick implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerBlockInteractEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionEnchantmentTableClick.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionEnchantmentTableClick.java index cf89a9244..3f0fd1c66 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionEnchantmentTableClick.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionEnchantmentTableClick.java @@ -11,7 +11,7 @@ public class ActionEnchantmentTableClick implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerBlockInteractEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerBankAddInterest.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerBankAddInterest.java index 250a54dff..c2024801a 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerBankAddInterest.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerBankAddInterest.java @@ -3,18 +3,18 @@ import net.minestom.server.event.player.PlayerSpawnEvent; import net.swofty.commons.StringUtility; import net.swofty.proxyapi.ProxyPlayer; -import net.swofty.type.skyblockgeneric.calendar.SkyBlockCalendar; -import net.swofty.type.skyblockgeneric.data.datapoints.DatapointBankData; -import net.swofty.type.skyblockgeneric.data.monogdb.CoopDatabase; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.calendar.SkyBlockCalendar; +import net.swofty.type.skyblockgeneric.data.datapoints.DatapointBankData; +import net.swofty.type.skyblockgeneric.data.monogdb.CoopDatabase; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class ActionPlayerBankAddInterest implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerSpawnEvent event) { if (event.isFirstSpawn()) return; SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerChangeHypixelMenuDisplay.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerChangeHypixelMenuDisplay.java index e8f338b47..ac2627f56 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerChangeHypixelMenuDisplay.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerChangeHypixelMenuDisplay.java @@ -7,12 +7,12 @@ import net.minestom.server.item.Material; import net.swofty.commons.StringUtility; import net.swofty.commons.item.ItemType; -import net.swofty.type.skyblockgeneric.collection.CustomCollectionAward; -import net.swofty.type.skyblockgeneric.data.datapoints.DatapointQuiver; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; import net.swofty.type.generic.gui.inventory.ItemStackCreator; +import net.swofty.type.skyblockgeneric.collection.CustomCollectionAward; +import net.swofty.type.skyblockgeneric.data.datapoints.DatapointQuiver; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.item.components.ArrowComponent; import net.swofty.type.skyblockgeneric.item.components.QuiverDisplayComponent; @@ -24,7 +24,7 @@ public class ActionPlayerChangeHypixelMenuDisplay implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(PlayerChangeHeldSlotEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); runCheck(player); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerChat.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerChat.java index aef4e9103..a53e9462b 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerChat.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerChat.java @@ -4,22 +4,22 @@ import net.swofty.commons.ServerType; import net.swofty.commons.StringUtility; import net.swofty.type.generic.HypixelConst; -import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader; import net.swofty.type.generic.data.datapoints.DatapointChatType; -import net.swofty.type.skyblockgeneric.data.SkyBlockDataHandler; import net.swofty.type.generic.data.datapoints.DatapointToggles; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; import net.swofty.type.generic.party.PartyManager; -import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import net.swofty.type.generic.user.categories.Rank; +import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader; +import net.swofty.type.skyblockgeneric.data.SkyBlockDataHandler; +import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import java.util.List; public class ActionPlayerChat implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(PlayerChatEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); event.setCancelled(true); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerInteractFairySoul.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerInteractFairySoul.java index 9deaffc8d..4a6ce7df4 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerInteractFairySoul.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerInteractFairySoul.java @@ -1,16 +1,16 @@ package net.swofty.type.skyblockgeneric.event.actions.player; import net.minestom.server.event.player.PlayerEntityInteractEvent; -import net.swofty.type.skyblockgeneric.entity.EntityFairySoul; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.entity.EntityFairySoul; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import net.swofty.type.skyblockgeneric.user.fairysouls.FairySoul; public class ActionPlayerInteractFairySoul implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerEntityInteractEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerLaunchPads.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerLaunchPads.java index 8d0dd7c34..7a2acaeec 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerLaunchPads.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerLaunchPads.java @@ -9,15 +9,12 @@ import net.minestom.server.event.player.PlayerMoveEvent; import net.minestom.server.network.packet.server.play.ParticlePacket; import net.minestom.server.particle.Particle; -import net.swofty.type.generic.data.HypixelDataHandler; -import net.swofty.type.generic.data.datapoints.DatapointRank; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; -import net.swofty.type.skyblockgeneric.data.SkyBlockDataHandler; +import net.swofty.type.generic.utility.MathUtility; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import net.swofty.type.skyblockgeneric.utility.LaunchPads; -import net.swofty.type.generic.utility.MathUtility; import java.util.List; @@ -25,7 +22,7 @@ public class ActionPlayerLaunchPads implements HypixelEventClass { private static final int SEGMENTS = 30; - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true , isAsync = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true, isAsync = true) public void run(PlayerMoveEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerRemoveTab.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerRemoveTab.java index b59467aad..0425b244a 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerRemoveTab.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerRemoveTab.java @@ -4,20 +4,19 @@ import net.minestom.server.entity.Player; import net.minestom.server.event.player.PlayerSpawnEvent; import net.minestom.server.network.packet.server.play.TeamsPacket; -import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader; -import net.swofty.type.generic.data.datapoints.DatapointRank; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; -import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import net.swofty.type.generic.user.categories.Rank; +import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader; +import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import java.util.ArrayList; import java.util.Collections; public class ActionPlayerRemoveTab implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerSpawnEvent event) { Player player = event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerRightClickOnPlayer.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerRightClickOnPlayer.java index 86d126634..487e9138f 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerRightClickOnPlayer.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerRightClickOnPlayer.java @@ -10,7 +10,7 @@ public class ActionPlayerRightClickOnPlayer implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerEntityInteractEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerStrayTooFar.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerStrayTooFar.java index e0fb77900..c581cf4a4 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerStrayTooFar.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerStrayTooFar.java @@ -5,9 +5,9 @@ import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.generic.user.categories.Rank; import net.swofty.type.skyblockgeneric.region.SkyBlockRegion; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; -import net.swofty.type.generic.user.categories.Rank; import java.util.HashMap; import java.util.Map; @@ -17,7 +17,7 @@ public class ActionPlayerStrayTooFar implements HypixelEventClass { public static Map startedStray = new HashMap<>(); - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerMoveEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); SkyBlockRegion region = player.getRegion(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerTravel.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerTravel.java index bf160633e..571d74eb6 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerTravel.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerTravel.java @@ -22,7 +22,7 @@ public class ActionPlayerTravel implements HypixelEventClass { public static List delay = new ArrayList<>(); - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerMoveEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/authentication/PlayerChatAuthentication.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/authentication/PlayerChatAuthentication.java index 9f7fc15a9..8bd2a80e3 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/authentication/PlayerChatAuthentication.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/authentication/PlayerChatAuthentication.java @@ -15,7 +15,7 @@ public class PlayerChatAuthentication implements HypixelEventClass { private static Map cooldowns = new HashMap<>(); - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(PlayerChatEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); if (player.hasAuthenticated) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/authentication/PlayerDisableMoveWhenAuthenticating.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/authentication/PlayerDisableMoveWhenAuthenticating.java index f94a2aa27..cf2c96fe7 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/authentication/PlayerDisableMoveWhenAuthenticating.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/authentication/PlayerDisableMoveWhenAuthenticating.java @@ -8,7 +8,7 @@ public class PlayerDisableMoveWhenAuthenticating implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(PlayerMoveEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); if (player.hasAuthenticated) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockDestroy.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockDestroy.java index 687e3b9c8..8ab63c1b5 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockDestroy.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockDestroy.java @@ -1,15 +1,15 @@ package net.swofty.type.skyblockgeneric.event.actions.player.blocks; import net.minestom.server.event.player.PlayerBlockBreakEvent; -import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; -import net.swofty.type.skyblockgeneric.block.impl.BlockBreakable; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; +import net.swofty.type.skyblockgeneric.block.impl.BlockBreakable; public class ActionBlockDestroy implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void onDestroy(PlayerBlockBreakEvent event) { if (SkyBlockBlock.isSkyBlockBlock(event.getBlock())) { SkyBlockBlock block = new SkyBlockBlock(event.getBlock()); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockInteract.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockInteract.java index 5a74ca75a..f7b92e192 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockInteract.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockInteract.java @@ -1,15 +1,15 @@ package net.swofty.type.skyblockgeneric.event.actions.player.blocks; import net.minestom.server.event.player.PlayerBlockInteractEvent; -import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; -import net.swofty.type.skyblockgeneric.block.impl.BlockInteractable; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; +import net.swofty.type.skyblockgeneric.block.impl.BlockInteractable; public class ActionBlockInteract implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void onInteract(PlayerBlockInteractEvent event) { if (SkyBlockBlock.isSkyBlockBlock(event.getBlock())) { SkyBlockBlock block = new SkyBlockBlock(event.getBlock()); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockPlaceable.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockPlaceable.java index 6474a12d5..bd5cc9c2b 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockPlaceable.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockPlaceable.java @@ -2,18 +2,18 @@ import net.minestom.server.event.player.PlayerBlockPlaceEvent; import net.minestom.server.item.ItemStack; -import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; -import net.swofty.type.skyblockgeneric.block.impl.BlockPlaceable; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.block.SkyBlockBlock; +import net.swofty.type.skyblockgeneric.block.impl.BlockPlaceable; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.item.components.PlaceableComponent; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class ActionBlockPlaceable implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void onPlace(PlayerBlockPlaceEvent event) { ItemStack itemStack = event.getPlayer().getItemInMainHand(); SkyBlockItem item = new SkyBlockItem(itemStack); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/data/ActionPlayerClearSkyBlockCache.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/data/ActionPlayerClearSkyBlockCache.java index 45cbe4657..1f9309441 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/data/ActionPlayerClearSkyBlockCache.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/data/ActionPlayerClearSkyBlockCache.java @@ -5,10 +5,10 @@ import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.generic.packet.packets.client.anticheat.PacketListenerAirJump; import net.swofty.type.skyblockgeneric.event.actions.player.ActionPlayerStrayTooFar; import net.swofty.type.skyblockgeneric.event.actions.player.fall.ActionPlayerFall; import net.swofty.type.skyblockgeneric.item.updater.PlayerItemOrigin; -import net.swofty.type.generic.packet.packets.client.anticheat.PacketListenerAirJump; import net.swofty.type.skyblockgeneric.server.eventcaller.CustomEventCaller; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import net.swofty.type.skyblockgeneric.user.SkyBlockScoreboard; @@ -16,7 +16,7 @@ public class ActionPlayerClearSkyBlockCache implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(PlayerDisconnectEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/data/ActionPlayerDataLoaded.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/data/ActionPlayerDataLoaded.java index 5e506dc41..f93f8946b 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/data/ActionPlayerDataLoaded.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/data/ActionPlayerDataLoaded.java @@ -13,23 +13,21 @@ import net.swofty.type.generic.data.datapoints.DatapointString; import net.swofty.type.generic.data.datapoints.DatapointStringList; import net.swofty.type.generic.data.mongodb.ProfilesDatabase; +import net.swofty.type.generic.event.EventNodes; +import net.swofty.type.generic.event.HypixelEvent; +import net.swofty.type.generic.event.HypixelEventClass; import net.swofty.type.generic.event.HypixelEventHandler; +import net.swofty.type.generic.user.categories.CustomGroups; +import net.swofty.type.generic.user.categories.Rank; +import net.swofty.type.generic.utility.MathUtility; import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader; import net.swofty.type.skyblockgeneric.data.SkyBlockDataHandler; import net.swofty.type.skyblockgeneric.data.SkyBlockDatapoint; import net.swofty.type.skyblockgeneric.data.datapoints.DatapointUUID; -import net.swofty.type.generic.entity.hologram.PlayerHolograms; -import net.swofty.type.generic.entity.npc.HypixelNPC; -import net.swofty.type.generic.event.EventNodes; -import net.swofty.type.generic.event.HypixelEvent; -import net.swofty.type.generic.event.HypixelEventClass; import net.swofty.type.skyblockgeneric.data.monogdb.CoopDatabase; import net.swofty.type.skyblockgeneric.event.custom.PlayerRegionChangeEvent; import net.swofty.type.skyblockgeneric.region.SkyBlockRegion; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; -import net.swofty.type.generic.user.categories.CustomGroups; -import net.swofty.type.generic.user.categories.Rank; -import net.swofty.type.generic.utility.MathUtility; import net.swofty.type.skyblockgeneric.warps.TravelScrollIslands; import org.tinylog.Logger; @@ -40,7 +38,7 @@ public class ActionPlayerDataLoaded implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER_DATA , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER_DATA, requireDataLoaded = false) public void run(PlayerSpawnEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); if (!event.isFirstSpawn()) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/fall/ActionPlayerFall.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/fall/ActionPlayerFall.java index 07183c9f2..127bf2255 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/fall/ActionPlayerFall.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/fall/ActionPlayerFall.java @@ -14,7 +14,7 @@ public class ActionPlayerFall implements HypixelEventClass { public static HashMap fallHeight = new HashMap<>(); - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerMoveEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); Pos newPosition = event.getNewPosition(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/fall/ActionPlayerVoid.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/fall/ActionPlayerVoid.java index b4d317d47..ce5282c45 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/fall/ActionPlayerVoid.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/fall/ActionPlayerVoid.java @@ -10,7 +10,7 @@ public class ActionPlayerVoid implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(PlayerMoveEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerClickItemUpdate.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerClickItemUpdate.java index 7600c5721..df1cecc4a 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerClickItemUpdate.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerClickItemUpdate.java @@ -10,7 +10,7 @@ public class ActionPlayerClickItemUpdate implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(InventoryItemChangeEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getInventory().getViewers().stream().toList().getFirst(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInteractWithCrafting.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInteractWithCrafting.java index d9783a925..009374537 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInteractWithCrafting.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInteractWithCrafting.java @@ -3,7 +3,6 @@ import net.minestom.server.event.inventory.InventoryPreClickEvent; import net.minestom.server.inventory.PlayerInventory; import net.minestom.server.inventory.click.Click; -import net.minestom.server.inventory.click.ClickType; import net.minestom.server.item.ItemStack; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; @@ -14,7 +13,7 @@ public class ActionPlayerInteractWithCrafting implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(InventoryPreClickEvent event) { SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClick.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClick.java index a6c389572..128dd5fed 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClick.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClick.java @@ -6,7 +6,6 @@ import net.minestom.server.event.inventory.InventoryPreClickEvent; import net.minestom.server.inventory.PlayerInventory; import net.minestom.server.inventory.click.Click; -import net.minestom.server.inventory.click.ClickType; import net.swofty.commons.StringUtility; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; @@ -22,7 +21,7 @@ public class ActionPlayerInventoryClick implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(InventoryPreClickEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); SkyBlockItem clickedItem = new SkyBlockItem(event.getClickedItem()); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClickAnvil.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClickAnvil.java index 7ffbbb52c..11b811cad 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClickAnvil.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClickAnvil.java @@ -13,7 +13,7 @@ public class ActionPlayerInventoryClickAnvil implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(InventoryPreClickEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClose.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClose.java index 80f85a2a6..67aaebae7 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClose.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryClose.java @@ -10,7 +10,7 @@ public class ActionPlayerInventoryClose implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(InventoryCloseEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); ActionPlayerChangeHypixelMenuDisplay.runCheck(player); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryCloseAnvil.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryCloseAnvil.java index 840d0f2a2..8b3440c55 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryCloseAnvil.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryCloseAnvil.java @@ -10,7 +10,7 @@ public class ActionPlayerInventoryCloseAnvil implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(InventoryCloseEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryPostClick.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryPostClick.java index 458e16c84..c287bacab 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryPostClick.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/gui/ActionPlayerInventoryPostClick.java @@ -5,14 +5,14 @@ import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; import net.swofty.type.generic.gui.inventory.HypixelInventoryGUI; -import net.swofty.type.skyblockgeneric.event.actions.player.ActionPlayerChangeHypixelMenuDisplay; import net.swofty.type.generic.gui.inventory.item.GUIClickableItem; import net.swofty.type.generic.gui.inventory.item.GUIItem; +import net.swofty.type.skyblockgeneric.event.actions.player.ActionPlayerChangeHypixelMenuDisplay; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class ActionPlayerInventoryPostClick implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = true) public void run(InventoryClickEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionArrowDamageMob.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionArrowDamageMob.java index 5a64e4e4a..20e3bc733 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionArrowDamageMob.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionArrowDamageMob.java @@ -5,11 +5,11 @@ import net.minestom.server.event.entity.projectile.ProjectileCollideWithEntityEvent; import net.swofty.commons.statistics.ItemStatistic; import net.swofty.commons.statistics.ItemStatistics; -import net.swofty.type.skyblockgeneric.entity.ArrowEntityImpl; -import net.swofty.type.skyblockgeneric.entity.mob.SkyBlockMob; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.entity.ArrowEntityImpl; +import net.swofty.type.skyblockgeneric.entity.mob.SkyBlockMob; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import net.swofty.type.skyblockgeneric.user.statistics.PlayerStatistics; @@ -19,7 +19,7 @@ public class PlayerActionArrowDamageMob implements HypixelEventClass { - @HypixelEvent(node = EventNodes.ALL , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.ALL, requireDataLoaded = false) public void run(ProjectileCollideWithEntityEvent event) { ArrowEntityImpl arrow; if (event.getEntity() instanceof ArrowEntityImpl arrowEntity) diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionDamageMob.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionDamageMob.java index e7ce9ec65..7480432d9 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionDamageMob.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionDamageMob.java @@ -10,15 +10,15 @@ import net.minestom.server.event.entity.EntityAttackEvent; import net.swofty.commons.statistics.ItemStatistic; import net.swofty.commons.statistics.ItemStatistics; -import net.swofty.type.skyblockgeneric.entity.mob.SkyBlockMob; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.generic.utility.MathUtility; +import net.swofty.type.skyblockgeneric.entity.mob.SkyBlockMob; import net.swofty.type.skyblockgeneric.event.value.SkyBlockValueEvent; import net.swofty.type.skyblockgeneric.event.value.events.PlayerDamageMobValueUpdateEvent; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; import net.swofty.type.skyblockgeneric.utility.DamageIndicator; -import net.swofty.type.generic.utility.MathUtility; import java.util.HashMap; import java.util.Map; @@ -29,7 +29,7 @@ public class PlayerActionDamageMob implements HypixelEventClass { private static final Random random = new Random(); private static final Map COOLDOWN = new HashMap<>(); - @HypixelEvent(node = EventNodes.ALL , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.ALL, requireDataLoaded = false) public void run(EntityAttackEvent event) { if (event.getTarget().getEntityType().equals(EntityType.PLAYER)) return; if (!event.getEntity().getEntityType().equals(EntityType.PLAYER)) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionDamagedAttacked.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionDamagedAttacked.java index 1f6ba7dfa..87e39786f 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionDamagedAttacked.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/mobdamage/PlayerActionDamagedAttacked.java @@ -4,10 +4,10 @@ import net.minestom.server.entity.damage.EntityDamage; import net.minestom.server.event.entity.EntityAttackEvent; import net.swofty.commons.statistics.ItemStatistics; -import net.swofty.type.skyblockgeneric.entity.mob.SkyBlockMob; import net.swofty.type.generic.event.EventNodes; import net.swofty.type.generic.event.HypixelEvent; import net.swofty.type.generic.event.HypixelEventClass; +import net.swofty.type.skyblockgeneric.entity.mob.SkyBlockMob; import net.swofty.type.skyblockgeneric.event.value.SkyBlockValueEvent; import net.swofty.type.skyblockgeneric.event.value.events.PlayerDamagedByMobValueUpdateEvent; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; @@ -18,7 +18,7 @@ public class PlayerActionDamagedAttacked implements HypixelEventClass { - @HypixelEvent(node = EventNodes.ENTITY , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.ENTITY, requireDataLoaded = false) public void run(EntityAttackEvent event) { if (!event.getTarget().getEntityType().equals(EntityType.PLAYER)) return; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/offhand/ActionOffhandHandClick.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/offhand/ActionOffhandHandClick.java index 2d5d058a4..afd60d685 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/offhand/ActionOffhandHandClick.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/offhand/ActionOffhandHandClick.java @@ -8,7 +8,7 @@ public class ActionOffhandHandClick implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(PlayerHandAnimationEvent event) { if (event.getHand().equals(PlayerHand.OFF)) { event.getPlayer().sendMessage("§cYou cannot use your offhand!"); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/offhand/ActionOffhandItemClick.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/offhand/ActionOffhandItemClick.java index 3fe75236f..5ffc38fbc 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/offhand/ActionOffhandItemClick.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/offhand/ActionOffhandItemClick.java @@ -6,7 +6,7 @@ import net.swofty.type.generic.event.HypixelEventClass; public class ActionOffhandItemClick implements HypixelEventClass { - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(PlayerSwapItemEvent event) { event.getPlayer().sendMessage("§cYou cannot use your offhand!"); event.setCancelled(true); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gems/GemRarity.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gems/GemRarity.java index ccc808266..441f10f49 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gems/GemRarity.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gems/GemRarity.java @@ -9,7 +9,7 @@ public enum GemRarity { //NORMAL ROUGH("Rough", Rarity.COMMON, 1, "§f", "§7Taken right from the heart of a", "§7crystal vein in the §5Crystal", "§5Hollows§7."), - FLAWED("Flawed", Rarity.UNCOMMON, 100, "§a", "§7A slightly better version of", "{GEM}§7, but it could still use some work."), + FLAWED("Flawed", Rarity.UNCOMMON, 100, "§a", "§7A slightly better version of", "{GEM}§7, but it could still use some work."), FINE("Fine", Rarity.RARE, 10000, "§b", "§7A type of {GEM} §7that has", "§7clearly been treated with care."), FLAWLESS("Flawless", Rarity.EPIC, 100000, "§5", "§7A new perfect version of", "{GEM}§7."), PERFECT("Perfect", Rarity.LEGENDARY, 500000, "§6", "§7A perfectly refined {GEM}§7."), diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/bazaar/GUIBazaar.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/bazaar/GUIBazaar.java index adda94d7a..f7d9da670 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/bazaar/GUIBazaar.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/bazaar/GUIBazaar.java @@ -149,7 +149,7 @@ private void rebuildCacheAndRender(SkyBlockPlayer player) { // Store the price data thread-safely setDataMap.get(set).put(type, new PriceData( type, - stats.averageAsk(), // Average sell price + stats.averageAsk(), // Average sell price stats.averageBid() // Average buy price )); }) diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/bazaar/selections/GUIBazaarOrderAmountSelection.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/bazaar/selections/GUIBazaarOrderAmountSelection.java index 788fdf0a9..37a4e0def 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/bazaar/selections/GUIBazaarOrderAmountSelection.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/bazaar/selections/GUIBazaarOrderAmountSelection.java @@ -76,13 +76,13 @@ private void buildInstantUI(SkyBlockPlayer p) { private void buildLimitUI(SkyBlockPlayer p) { // matches your screenshots: “Buy a stack!”, “Buy a big stack!”, “Buy a thousand!”, “Custom Amount” - int small = Math.min(64, maxAmount); + int small = Math.min(64, maxAmount); int medium = Math.min(160, maxAmount); int large = Math.min(1024,maxAmount); - addLimitButton(9, small, "Buy a stack!", "Amount: " + small + "×", p); - addLimitButton(11, medium, "Buy a big stack!", "Amount: " + medium + "×", p); - addLimitButton(13, large, "Buy a thousand!", "Amount: " + large + "×", p); + addLimitButton(9, small, "Buy a stack!", "Amount: " + small + "×", p); + addLimitButton(11, medium, "Buy a big stack!","Amount: " + medium + "×", p); + addLimitButton(13, large, "Buy a thousand!", "Amount: " + large + "×", p); addCustom(15, p); } diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/museum/GUIYourMuseum.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/museum/GUIYourMuseum.java index a715dfb4c..59391110c 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/museum/GUIYourMuseum.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/museum/GUIYourMuseum.java @@ -181,7 +181,7 @@ public static String getAsDisplay(int unlocked, int total) { String completedLoadingBar = "§b§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/levels/rewards/GUILevelRewards.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/levels/rewards/GUILevelRewards.java index 2442b9cee..073cbc24d 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/levels/rewards/GUILevelRewards.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/levels/rewards/GUILevelRewards.java @@ -206,7 +206,7 @@ public static List getAsDisplay(int unlocked, int total) { String completedLoadingBar = "§b§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeBook.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeBook.java index 76020bf6a..b92e3ad72 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeBook.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeBook.java @@ -105,7 +105,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); @@ -169,7 +169,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeCategory.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeCategory.java index 284ec8ad8..f7ce9802c 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeCategory.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeCategory.java @@ -145,7 +145,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeSlayers.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeSlayers.java index 3e5408065..ec5062762 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeSlayers.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/recipe/GUIRecipeSlayers.java @@ -92,7 +92,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); @@ -142,7 +142,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/PetComponent.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/PetComponent.java index e2037af27..7e75e5670 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/PetComponent.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/PetComponent.java @@ -59,8 +59,8 @@ public PetComponent(String petName, RarityValue georgePrice, addInheritedComponent(new TrackedUniqueComponent()); addInheritedComponent(new InteractableComponent(this::interact, this::interact, null)); addInheritedComponent(new LoreUpdateComponent( - new LoreConfig((item, player) -> getAbsoluteLore(player, item), null) - , true)); + new LoreConfig((item, player) -> getAbsoluteLore(player, item), null), true) + ); } private void interact(SkyBlockPlayer player, SkyBlockItem item) { diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/crafting/SkyBlockRecipe.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/crafting/SkyBlockRecipe.java index df36c9876..4ef31ba16 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/crafting/SkyBlockRecipe.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/crafting/SkyBlockRecipe.java @@ -116,7 +116,7 @@ public static List getMissionDisplay(List lore, UUID uuid) { String completedLoadingBar = "§2§m" + baseLoadingBar.substring(0, Math.min(completedLength, maxBarLength)); int formattingCodeLength = 4; // Adjust this if you add or remove formatting codes String uncompletedLoadingBar = "§7§m" + baseLoadingBar.substring(Math.min( - completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes + completedLoadingBar.length() - formattingCodeLength, // Adjust for added formatting codes maxBarLength )); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/events/RuneItemEvent.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/events/RuneItemEvent.java index 7611e00d7..3e7cb4ace 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/events/RuneItemEvent.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/events/RuneItemEvent.java @@ -11,7 +11,7 @@ import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; public class RuneItemEvent implements HypixelEventClass { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true , isAsync = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true, isAsync = true) public void run(PlayerKilledSkyBlockMobEvent event) { SkyBlockPlayer player = event.getPlayer(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/minion/extension/extensions/MinionFuelExtension.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/minion/extension/extensions/MinionFuelExtension.java index 62baf5989..6f9777e32 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/minion/extension/extensions/MinionFuelExtension.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/minion/extension/extensions/MinionFuelExtension.java @@ -4,18 +4,16 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.TextDecoration; import net.minestom.server.component.DataComponents; -import net.minestom.server.event.inventory.InventoryClickEvent; import net.minestom.server.event.inventory.InventoryPreClickEvent; import net.minestom.server.inventory.click.Click; -import net.minestom.server.inventory.click.ClickType; import net.minestom.server.item.ItemStack; import net.minestom.server.item.Material; import net.swofty.commons.StringUtility; import net.swofty.commons.item.ItemType; import net.swofty.type.generic.gui.inventory.ItemStackCreator; +import net.swofty.type.generic.gui.inventory.item.GUIClickableItem; import net.swofty.type.generic.user.HypixelPlayer; import net.swofty.type.skyblockgeneric.gui.inventories.GUIMinion; -import net.swofty.type.generic.gui.inventory.item.GUIClickableItem; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.item.components.MinionFuelComponent; import net.swofty.type.skyblockgeneric.item.updater.NonPlayerItemUpdater; @@ -154,7 +152,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { lore.add(Component.text("")); lore.add(Component.text("§cRight Click to destroy this fuel.") .decorations(Collections.singleton(TextDecoration.ITALIC), false)); - }else{ + } else { lore.add(Component.text("")); lore.add(Component.text("§eClick to take fuel out.") .decorations(Collections.singleton(TextDecoration.ITALIC), false)); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/mission/missions/blacksmith/MissionTalkToBlacksmith.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/mission/missions/blacksmith/MissionTalkToBlacksmith.java index b7c8116ee..786d965ca 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/mission/missions/blacksmith/MissionTalkToBlacksmith.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/mission/missions/blacksmith/MissionTalkToBlacksmith.java @@ -16,7 +16,7 @@ public class MissionTalkToBlacksmith extends SkyBlockMission implements LocationAssociatedMission { - @HypixelEvent(node = EventNodes.CUSTOM , requireDataLoaded = true) + @HypixelEvent(node = EventNodes.CUSTOM, requireDataLoaded = true) public void run(PlayerRegionChangeEvent event) { MissionData data = event.getPlayer().getMissionData(); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/server/attribute/SkyBlockServerAttributes.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/server/attribute/SkyBlockServerAttributes.java index 99843f7aa..020d9a6c8 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/server/attribute/SkyBlockServerAttributes.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/server/attribute/SkyBlockServerAttributes.java @@ -7,8 +7,8 @@ import net.minestom.server.timer.TaskSchedule; import net.swofty.type.generic.HypixelConst; import net.swofty.type.generic.HypixelTypeLoader; -import net.swofty.type.skyblockgeneric.calendar.SkyBlockCalendar; import net.swofty.type.generic.data.mongodb.AttributeDatabase; +import net.swofty.type.skyblockgeneric.calendar.SkyBlockCalendar; import net.swofty.type.skyblockgeneric.server.attribute.attributes.AttributeLong; import org.bson.Document; @@ -66,7 +66,7 @@ public , T> R get(Attributes attribute, Class ty public static void saveAttributeLoop() { MinecraftServer.getSchedulerManager().scheduleTask(() -> { AttributeDatabase.saveDocument(toDocument()); - }, TaskSchedule.seconds(3), TaskSchedule.seconds(3) , ExecutionType.TICK_END); + }, TaskSchedule.seconds(3), TaskSchedule.seconds(3), ExecutionType.TICK_END); } public enum Attributes { diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/AlchemySkill.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/AlchemySkill.java index acd6ab4a6..6c0599513 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/AlchemySkill.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/AlchemySkill.java @@ -350,7 +350,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(14, 15000, new XPReward() { @Override @@ -374,7 +374,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(15, 20000, new XPReward() { @Override @@ -398,7 +398,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(16, 30000, new XPReward() { @Override @@ -422,7 +422,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(17, 50000, new XPReward() { @Override @@ -446,7 +446,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(18, 75000, new XPReward() { @Override @@ -470,7 +470,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(19, 100000, new XPReward() { @Override @@ -494,7 +494,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(20, 200000, new XPReward() { @Override @@ -518,7 +518,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(21, 300000, new XPReward() { @Override @@ -542,7 +542,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(22, 400000, new XPReward() { @Override @@ -566,7 +566,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(23, 500000, new XPReward() { @Override @@ -590,7 +590,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(24, 600000, new XPReward() { @Override @@ -614,7 +614,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(25, 700000, new XPReward() { @Override @@ -638,7 +638,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(26, 800000, new XPReward() { @Override @@ -662,7 +662,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(27, 900000, new XPReward() { @Override @@ -686,7 +686,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(28, 1000000, new XPReward() { @Override @@ -710,7 +710,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(29, 1100000, new XPReward() { @Override @@ -734,7 +734,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(30, 1200000, new XPReward() { @Override @@ -758,7 +758,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(31, 1300000, new XPReward() { @Override @@ -782,7 +782,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(32, 1400000, new XPReward() { @Override @@ -806,7 +806,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(33, 1500000, new XPReward() { @Override @@ -830,7 +830,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(34, 1600000, new XPReward() { @Override @@ -854,7 +854,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(35, 1700000, new XPReward() { @Override @@ -878,7 +878,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(36, 1800000, new XPReward() { @Override @@ -902,7 +902,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(37, 1900000, new XPReward() { @Override @@ -926,7 +926,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(38, 2000000, new XPReward() { @Override @@ -950,7 +950,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(39, 2100000, new XPReward() { @Override @@ -974,7 +974,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(40, 2200000, new XPReward() { @Override @@ -998,7 +998,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(41, 2300000, new XPReward() { @Override @@ -1022,7 +1022,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(42, 2400000, new XPReward() { @Override @@ -1046,7 +1046,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(43, 2500000, new XPReward() { @Override @@ -1070,7 +1070,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(44, 2600000, new XPReward() { @Override @@ -1094,7 +1094,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(45, 2750000, new XPReward() { @Override @@ -1118,7 +1118,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(46, 2900000, new XPReward() { @Override @@ -1142,7 +1142,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(47, 3100000, new XPReward() { @Override @@ -1166,7 +1166,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(48, 3400000, new XPReward() { @Override @@ -1190,7 +1190,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(49, 3700000, new XPReward() { @Override @@ -1214,7 +1214,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 2D; } - } ), + }), new SkillReward(50, 4000000, new XPReward() { @Override diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/CarpentrySkill.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/CarpentrySkill.java index 81dd0d66e..97e9753db 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/CarpentrySkill.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/CarpentrySkill.java @@ -350,7 +350,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(14, 15000, new XPReward() { @Override @@ -374,7 +374,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(15, 20000, new XPReward() { @Override @@ -398,7 +398,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(16, 30000, new XPReward() { @Override @@ -422,7 +422,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(17, 50000, new XPReward() { @Override @@ -446,7 +446,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(18, 75000, new XPReward() { @Override @@ -470,7 +470,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(19, 100000, new XPReward() { @Override @@ -494,7 +494,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(20, 200000, new XPReward() { @Override @@ -518,7 +518,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(21, 300000, new XPReward() { @Override @@ -542,7 +542,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(22, 400000, new XPReward() { @Override @@ -566,7 +566,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(23, 500000, new XPReward() { @Override @@ -590,7 +590,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(24, 600000, new XPReward() { @Override @@ -614,7 +614,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(25, 700000, new XPReward() { @Override @@ -638,7 +638,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(26, 800000, new XPReward() { @Override @@ -662,7 +662,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(27, 900000, new XPReward() { @Override @@ -686,7 +686,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(28, 1000000, new XPReward() { @Override @@ -710,7 +710,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(29, 1100000, new XPReward() { @Override @@ -734,7 +734,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(30, 1200000, new XPReward() { @Override @@ -758,7 +758,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(31, 1300000, new XPReward() { @Override @@ -782,7 +782,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(32, 1400000, new XPReward() { @Override @@ -806,7 +806,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(33, 1500000, new XPReward() { @Override @@ -830,7 +830,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(34, 1600000, new XPReward() { @Override @@ -854,7 +854,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(35, 1700000, new XPReward() { @Override @@ -878,7 +878,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(36, 1800000, new XPReward() { @Override @@ -902,7 +902,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(37, 1900000, new XPReward() { @Override @@ -926,7 +926,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(38, 2000000, new XPReward() { @Override @@ -950,7 +950,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(39, 2100000, new XPReward() { @Override @@ -974,7 +974,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(40, 2200000, new XPReward() { @Override @@ -998,7 +998,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(41, 2300000, new XPReward() { @Override @@ -1022,7 +1022,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(42, 2400000, new XPReward() { @Override @@ -1046,7 +1046,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(43, 2500000, new XPReward() { @Override @@ -1070,7 +1070,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(44, 2600000, new XPReward() { @Override @@ -1094,7 +1094,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(45, 2750000, new XPReward() { @Override @@ -1118,7 +1118,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(46, 2900000, new XPReward() { @Override @@ -1142,7 +1142,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(47, 3100000, new XPReward() { @Override @@ -1166,7 +1166,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(48, 3400000, new XPReward() { @Override @@ -1190,7 +1190,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(49, 3700000, new XPReward() { @Override @@ -1214,7 +1214,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(50, 4000000, new XPReward() { @Override diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/TamingSkill.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/TamingSkill.java index 61bf9190e..e2ac611fa 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/TamingSkill.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/skill/skills/TamingSkill.java @@ -50,7 +50,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(2, 125, new XPReward() { @Override @@ -74,7 +74,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(3, 200, new XPReward() { @Override @@ -98,7 +98,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(4, 300, new XPReward() { @Override @@ -122,7 +122,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(5, 500, new XPReward() { @Override @@ -146,7 +146,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(6, 750, new XPReward() { @Override @@ -170,7 +170,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(7, 1000, new XPReward() { @Override @@ -194,7 +194,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(8, 1500, new XPReward() { @Override @@ -218,7 +218,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(9, 2000, new XPReward() { @Override @@ -242,7 +242,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(10, 3500, new XPReward() { @Override @@ -266,7 +266,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(11, 5000, new XPReward() { @Override @@ -290,7 +290,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(12, 7500, new XPReward() { @Override @@ -314,7 +314,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(13, 10000, new XPReward() { @Override @@ -338,7 +338,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(14, 15000, new XPReward() { @Override @@ -362,7 +362,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(15, 20000, new XPReward() { @Override @@ -386,7 +386,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(16, 30000, new XPReward() { @Override @@ -410,7 +410,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(17, 50000, new XPReward() { @Override @@ -434,7 +434,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(18, 75000, new XPReward() { @Override @@ -458,7 +458,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(19, 100000, new XPReward() { @Override @@ -482,7 +482,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(20, 200000, new XPReward() { @Override @@ -506,7 +506,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(21, 300000, new XPReward() { @Override @@ -530,7 +530,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(22, 400000, new XPReward() { @Override @@ -554,7 +554,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(23, 500000, new XPReward() { @Override @@ -578,7 +578,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(24, 600000, new XPReward() { @Override @@ -602,7 +602,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(25, 700000, new XPReward() { @Override @@ -626,7 +626,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(26, 800000, new XPReward() { @Override @@ -650,7 +650,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(27, 900000, new XPReward() { @Override @@ -674,7 +674,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(28, 1000000, new XPReward() { @Override @@ -698,7 +698,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(29, 1100000, new XPReward() { @Override @@ -722,7 +722,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(30, 1200000, new XPReward() { @Override @@ -746,7 +746,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(31, 1300000, new XPReward() { @Override @@ -770,7 +770,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(32, 1400000, new XPReward() { @Override @@ -794,7 +794,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(33, 1500000, new XPReward() { @Override @@ -818,7 +818,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(34, 1600000, new XPReward() { @Override @@ -842,7 +842,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(35, 1700000, new XPReward() { @Override @@ -866,7 +866,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(36, 1800000, new XPReward() { @Override @@ -890,7 +890,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(37, 1900000, new XPReward() { @Override @@ -914,7 +914,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(38, 2000000, new XPReward() { @Override @@ -938,7 +938,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(39, 2100000, new XPReward() { @Override @@ -962,7 +962,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(40, 2200000, new XPReward() { @Override @@ -986,7 +986,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(41, 2300000, new XPReward() { @Override @@ -1010,7 +1010,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(42, 2400000, new XPReward() { @Override @@ -1034,7 +1034,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(43, 2500000, new XPReward() { @Override @@ -1058,7 +1058,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(44, 2600000, new XPReward() { @Override @@ -1082,7 +1082,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(45, 2750000, new XPReward() { @Override @@ -1106,7 +1106,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(46, 2900000, new XPReward() { @Override @@ -1130,7 +1130,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(47, 3100000, new XPReward() { @Override @@ -1154,7 +1154,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(48, 3400000, new XPReward() { @Override @@ -1178,7 +1178,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(49, 3700000, new XPReward() { @Override @@ -1202,7 +1202,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(50, 4000000, new XPReward() { @Override @@ -1226,7 +1226,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(51, 4300000, new XPReward() { @Override @@ -1250,7 +1250,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(52, 4600000, new XPReward() { @Override @@ -1274,7 +1274,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(53, 4900000, new XPReward() { @Override @@ -1298,7 +1298,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(54, 5200000, new XPReward() { @Override @@ -1322,7 +1322,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(55, 5500000, new XPReward() { @Override @@ -1346,7 +1346,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(56, 5800000, new XPReward() { @Override @@ -1370,7 +1370,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(57, 6100000, new XPReward() { @Override @@ -1394,7 +1394,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(58, 6400000, new XPReward() { @Override @@ -1418,7 +1418,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(59, 6700000, new XPReward() { @Override @@ -1442,7 +1442,7 @@ public ItemStatistic getStatistic() { public Double amountAdded() { return 1D; } - } ), + }), new SkillReward(60, 7000000, new XPReward() { @Override diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/SkyBlockPlayer.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/SkyBlockPlayer.java index 64766ab3f..82546fa79 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/SkyBlockPlayer.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/SkyBlockPlayer.java @@ -7,7 +7,6 @@ import net.kyori.adventure.sound.Sound; import net.kyori.adventure.text.Component; import net.minestom.server.entity.PlayerHand; -import net.minestom.server.entity.PlayerSkin; import net.minestom.server.event.inventory.InventoryCloseEvent; import net.minestom.server.instance.block.Block; import net.minestom.server.inventory.Inventory; @@ -18,20 +17,17 @@ import net.minestom.server.network.player.GameProfile; import net.minestom.server.network.player.PlayerConnection; import net.swofty.commons.PlayerShopData; -import net.swofty.commons.ServerType; +import net.swofty.commons.SkyBlockPlayerProfiles; import net.swofty.commons.StringUtility; import net.swofty.commons.item.ItemType; import net.swofty.commons.item.Rarity; import net.swofty.commons.item.UnderstandableSkyBlockItem; import net.swofty.commons.statistics.ItemStatistic; -import net.swofty.proxyapi.ProxyPlayer; -import net.swofty.type.generic.data.*; +import net.swofty.type.generic.HypixelConst; +import net.swofty.type.generic.data.HypixelDataHandler; import net.swofty.type.generic.data.datapoints.*; import net.swofty.type.generic.gui.inventory.HypixelInventoryGUI; -import net.swofty.type.generic.user.AntiCheatHandler; import net.swofty.type.generic.user.HypixelPlayer; -import net.swofty.type.generic.HypixelConst; -import net.swofty.commons.SkyBlockPlayerProfiles; import net.swofty.type.skyblockgeneric.SkyBlockGenericLoader; import net.swofty.type.skyblockgeneric.bazaar.BazaarConnector; import net.swofty.type.skyblockgeneric.collection.CustomCollectionAward; @@ -824,7 +820,7 @@ public void closeInventory() { if (gui == null) return; if (tempInv == null) return; - gui.onClose(new InventoryCloseEvent(tempInv, this , true), net.swofty.type.generic.gui.inventory.HypixelInventoryGUI.CloseReason.SERVER_EXITED); + gui.onClose(new InventoryCloseEvent(tempInv, this, true), net.swofty.type.generic.gui.inventory.HypixelInventoryGUI.CloseReason.SERVER_EXITED); net.swofty.type.generic.gui.inventory.HypixelInventoryGUI.GUI_MAP.remove(this.getUuid()); } } diff --git a/type.thefarmingislands/src/main/java/net/swofty/type/thefarmingislands/events/ActionPlayerJoin.java b/type.thefarmingislands/src/main/java/net/swofty/type/thefarmingislands/events/ActionPlayerJoin.java index 118f16542..65f198896 100644 --- a/type.thefarmingislands/src/main/java/net/swofty/type/thefarmingislands/events/ActionPlayerJoin.java +++ b/type.thefarmingislands/src/main/java/net/swofty/type/thefarmingislands/events/ActionPlayerJoin.java @@ -11,7 +11,7 @@ public class ActionPlayerJoin implements HypixelEventClass { @SneakyThrows - @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = false) + @HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false) public void run(AsyncPlayerConfigurationEvent event) { final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer(); diff --git a/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java b/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java index 2e9ba6abc..66c4b4f02 100644 --- a/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java +++ b/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java @@ -97,7 +97,7 @@ public SkyBlockVelocity(ProxyServer tempServer, Logger tempLogger, @DataDirector public void onProxyInitialization(ProxyInitializeEvent event) { server = proxy; shouldAuthenticate = Configuration.getOrDefault("require-authentication", false); - supportCrossVersion = Configuration.getOrDefault("cross-version-support" , false); + supportCrossVersion = Configuration.getOrDefault("cross-version-support", false); /** * initialize cross version support @@ -140,7 +140,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) { .plugin(this) .build(); - commandManager.register(statusCommandMeta , new ServerStatusCommand()); + commandManager.register(statusCommandMeta, new ServerStatusCommand()); /**