Merge remote-tracking branch 'origin/master'

Author: Swofty-Developments

README.md

@@ -35,9 +35,9 @@ A video of me going through the guide [can be found here](https://www.youtube.co
 1. Download 'SkyBlockProxy.jar' from the releases page [here](https://github.com/Swofty-Developments/HypixelSkyBlock/releases/tag/latest)
 2. Download the Velocity proxy from [here](https://api.papermc.io/v2/projects/velocity/versions/3.4.0-SNAPSHOT/builds/463/downloads/velocity-3.4.0-SNAPSHOT-463.jar)
 3. Download `velocity.toml` from [here](https://github.com/Swofty-Developments/HypixelSkyBlock/tree/master/configuration) and move it to where you want your Proxy server to run.
-4. Move your Velocity proxy JAR into that folder aswell, and run the proxy using `java -jar velocity-3.4.0-SNAPSHOT-463.jar` as a command in that directory.
+4. Move your Velocity proxy JAR into that folder as well, and run the proxy using `java -jar velocity-3.4.0-SNAPSHOT-463.jar` as a command in that directory.
 5. Close this proxy once it has generated the `plugins` folder, just by pressing `CTRL + C` or closing the CMD Prompt.
-6. Move the `SkyBlockProxy.jar` from earlier into the plugins folder.
+6. Move the `SkyBlockProxy.jar` from earlier into the plugins' folder.
 7. Make a new folder where your `velocity.toml` is and call it `configuration`
 8. Download `resources.json` from [here](https://github.com/Swofty-Developments/HypixelSkyBlock/tree/master/configuration)
 9. Move this file into the `configuration` folder you just made.
@@ -62,7 +62,7 @@ A video of me going through the guide [can be found here](https://www.youtube.co
 16. (OPTIONAL) If you wish to have Songs on your server, copy the `songs` folder from [here](https://github.com/Swofty-Developments/HypixelSkyBlock/tree/master/configuration), and put it inside your configuration folder.
 
 ### Service Setup Guide
-1. Due to the nature of SkyBlock, there may be a variety of services that need to be ran. Go to the releases page [here](https://github.com/Swofty-Developments/HypixelSkyBlock/releases/tag/latest) and download any .JAR files that start with `Service`.
+1. Due to the nature of SkyBlock, there may be a variety of services that need to be run. Go to the releases page [here](https://github.com/Swofty-Developments/HypixelSkyBlock/releases/tag/latest) and download any .JAR files that start with `Service`.
 2. Move these JAR files into the same directory as your Game Servers, they will share the configuration JSON with the services.
 3. Run them using `java -jar {Insert the JAR file}`.
 
@@ -80,13 +80,13 @@ A video of me going through the guide [can be found here](https://www.youtube.co
 ## 🐋 Running with Docker
 - Install the git repository using `git clone https://github.com/Swofty-Developments/HypixelSkyBlock.git
 
-Most parts about downloading and setting up files will be automated for you but you will need to add the following files to the `configuration` folder:
+Most parts about downloading and setting up files will be automated for you, but you will need to add the following files to the `configuration` folder:
 
-- Download the [world files for the Hub and Island worlds.](https://www.mediafire.com/file/5oko5y8h7uj6i9z/world.zip/file). Make sure they are named as **world.zip**
+- Download the [world files for the Hub and Island worlds](https://www.mediafire.com/file/5oko5y8h7uj6i9z/world.zip/file). Make sure they are named as **world.zip**
 
 - In your configuration file Remove the default `resources.json` and rename `resources.json.docker` to `resources.json`
 
-## Running the contaniners! 
+## Running the containers! 
 
 - (Recommended) Install Docker Desktop from [here](https://www.docker.com/products/docker-desktop).
 - Open Docker Desktop/Docker and ensure that it is running.
@@ -102,7 +102,7 @@ docker-compose up --build
 ```bash
 docker-compose up --build -d
 ```
-> Note: If you have already runned the server before with `docker-compose up --build` you can just run `docker-compose up` to start the server without rebuilding the images making it faster.
+> Note: If you have already run the server before with `docker-compose up --build` you can just run `docker-compose up` to start the server without rebuilding the images making it faster.
 
 - To stop the containers, you can use:
 
@@ -138,7 +138,7 @@ and then run the service command inside there. It will create its own screen ses
 ## Common Issues
 1. `redis.clients.jedis.exceptions.JedisConnectionException: Failed to connect to any host resolved for DNS name.`
 
-    => Your Memurai isn't running.
+    => Your Memurai isn't running. If this can not be fixed, try out [this](https://github.com/tporadowski/redis/releases) instead.
 2. `Preview features are not enabled for... Try running with '--enable-preview'`
 
     => try `java --enable-preview -jar SkyBlockCore.jar {ServerType}`

anticheat/src/main/java/net/swofty/anticheat/engine/MovementEvents.java

@@ -15,22 +15,22 @@ public void onPacketReceive(AnticheatPacketEvent event) {
         Pos pos = player.getCurrentTick().getPos();
         boolean onGround = player.getCurrentTick().isOnGround();
 
-        if (packet instanceof PositionPacket) {
-            PositionPacket positionPacket = (PositionPacket) packet;
-            pos = new Pos(positionPacket.getX(),
-                    positionPacket.getY(), positionPacket.getZ(),
-                    pos.yaw(), pos.pitch());
-            onGround = positionPacket.isOnGround();
-        } else if (packet instanceof PositionAndRotationPacket) {
-            PositionAndRotationPacket positionAndRotationPacket = (PositionAndRotationPacket) packet;
-            pos = positionAndRotationPacket.getPos();
-            onGround = positionAndRotationPacket.isOnGround();
-        } else if (packet instanceof IsOnGroundPacket) {
-            IsOnGroundPacket isOnGroundPacket = (IsOnGroundPacket) packet;
-            onGround = isOnGroundPacket.isOnGround();
-        } else if (packet instanceof RotationPacket) {
-            RotationPacket rotationPacket = (RotationPacket) packet;
-            pos = new Pos(pos.x(), pos.y(), pos.z(), rotationPacket.getYaw(), rotationPacket.getPitch());
+        switch (packet) {
+            case PositionPacket positionPacket -> {
+                pos = new Pos(positionPacket.getX(),
+                        positionPacket.getY(), positionPacket.getZ(),
+                        pos.yaw(), pos.pitch());
+                onGround = positionPacket.isOnGround();
+            }
+            case PositionAndRotationPacket positionAndRotationPacket -> {
+                pos = positionAndRotationPacket.getPos();
+                onGround = positionAndRotationPacket.isOnGround();
+            }
+            case IsOnGroundPacket isOnGroundPacket -> onGround = isOnGroundPacket.isOnGround();
+            case RotationPacket rotationPacket ->
+                    pos = new Pos(pos.x(), pos.y(), pos.z(), rotationPacket.getYaw(), rotationPacket.getPitch());
+            default -> {
+            }
         }
 
         player.processMovement(pos, onGround);

anticheat/src/main/java/net/swofty/anticheat/engine/PingEvents.java

@@ -10,8 +10,7 @@ public class PingEvents extends AntiCheatListener {
     @ListenerMethod
     public void onPacketReceive(AnticheatPacketEvent event) {
         SwoftyPacket packet = event.getPacket();
-        if (packet instanceof PingResponsePacket) {
-            PingResponsePacket pingResponsePacket = (PingResponsePacket) packet;
+        if (packet instanceof PingResponsePacket pingResponsePacket) {
             SwoftyPlayer player = pingResponsePacket.getPlayer();
             if (player != null) player.handlePingResponse(pingResponsePacket.getRequestId());
         }

anticheat/src/main/java/net/swofty/anticheat/math/Vel.java

@@ -358,7 +358,7 @@ public double dot(@NotNull Vel Vel) {
     }
 
     /**
-     * Rotates the Veltor around a given arbitrary axis in 3 dimensional space.
+     * Rotates the Veltor around a given arbitrary axis in 3-dimensional space.
      *
      * <p>
      * Rotation will follow the general Right-Hand-Rule, which means rotation
@@ -382,7 +382,7 @@ public double dot(@NotNull Vel Vel) {
     }
 
     /**
-     * Rotates the Veltor around a given arbitrary axis in 3 dimensional space.
+     * Rotates the Veltor around a given arbitrary axis in 3-dimensional space.
      *
      * <p>
      * Rotation will follow the general Right-Hand-Rule, which means rotation

commons/src/main/java/net/swofty/commons/ChatColor.java

@@ -30,7 +30,7 @@ public enum ChatColor {
     RESET('r', 21);
 
     public static final char COLOR_CHAR = '§';
-    private static final Pattern STRIP_COLOR_PATTERN = Pattern.compile("(?i)" + String.valueOf('§') + "[0-9A-FK-OR]");
+    private static final Pattern STRIP_COLOR_PATTERN = Pattern.compile("(?i)" + '§' + "[0-9A-FK-OR]");
     private final int intCode;
     private final char code;
     private final boolean isFormat;

commons/src/main/java/net/swofty/commons/PlayerShopData.java

@@ -74,25 +74,25 @@ public int pushBuyback(UnderstandableSkyBlockItem item, int amount) {
     public Tuple<UnderstandableSkyBlockItem, Integer> popBuyback() {
         if (buybackData.isEmpty())
             throw new IndexOutOfBoundsException("Woah there!");
-        Tuple<UnderstandableSkyBlockItem, Integer> last = buybackData.get(buybackData.size() - 1);
-        buybackData.remove(buybackData.size() - 1);
+        Tuple<UnderstandableSkyBlockItem, Integer> last = buybackData.getLast();
+        buybackData.removeLast();
         return last;
     }
 
     public Tuple<UnderstandableSkyBlockItem, Integer> lastBuyback() {
         if (buybackData.isEmpty())
             throw new IndexOutOfBoundsException("Woah there!");
-        return buybackData.get(buybackData.size() - 1);
+        return buybackData.getLast();
     }
 
     public Tuple<UnderstandableSkyBlockItem, Integer> firstBuyback() {
         if (buybackData.isEmpty())
             throw new IndexOutOfBoundsException("Woah there!");
-        return buybackData.get(0);
+        return buybackData.getFirst();
     }
 
     public boolean hasAnythingToBuyback() {
-        return buybackData.size() > 0;
+        return !buybackData.isEmpty();
     }
 
     public Map<String, Object> serialize() {

commons/src/main/java/net/swofty/commons/TrackedItem.java

@@ -47,7 +47,7 @@ public void addOrUpdateAttachedPlayer(UUID playerUUID, UUID profileUUID) {
         if (attachedPlayers.isEmpty()) {
             attachedPlayers.add(new PlayerOwnershipLog(playerUUID, profileUUID, System.currentTimeMillis(), System.currentTimeMillis()));
         } else {
-            PlayerOwnershipLog lastLog = attachedPlayers.get(attachedPlayers.size() - 1);
+            PlayerOwnershipLog lastLog = attachedPlayers.getLast();
             if (lastLog.playerUUID.equals(playerUUID) && lastLog.playerProfileUUID.equals(profileUUID)) {
                 lastLog = new PlayerOwnershipLog(lastLog.playerUUID, lastLog.playerProfileUUID, lastLog.firstSeen, System.currentTimeMillis());
                 attachedPlayers.set(attachedPlayers.size() - 1, lastLog);

commons/src/main/java/net/swofty/commons/auctions/AuctionItem.java

@@ -5,6 +5,7 @@
 import net.swofty.commons.item.UnderstandableSkyBlockItem;
 import net.swofty.commons.protocol.serializers.UnderstandableSkyBlockItemSerializer;
 import org.bson.Document;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,7 +63,7 @@ public static AuctionItem fromDocument(Document document) {
     }
 
     public record Bid(Long timestamp, UUID uuid, Long value) {
-        public String toString() {
+        public @NotNull String toString() {
             return timestamp + "," + uuid + "," + value;
         }
 

commons/src/main/java/net/swofty/commons/item/ItemType.java

@@ -876,7 +876,7 @@ public enum ItemType {
     COAL_BLOCK(Material.COAL_BLOCK, Rarity.COMMON),
     LAPIS_LAZULI_BLOCK(Material.LAPIS_BLOCK, Rarity.COMMON),
     BROWN_MUSHROOM_BLOCK(Material.BROWN_MUSHROOM_BLOCK, Rarity.COMMON),
-    RED_MUSHROOM_BLOCK(Material.BROWN_MUSHROOM_BLOCK, Rarity.COMMON),
+    RED_MUSHROOM_BLOCK(Material.RED_MUSHROOM_BLOCK, Rarity.COMMON),
     BLAZE_POWDER(Material.BLAZE_POWDER, Rarity.COMMON),
     GOLDEN_CARROT(Material.GOLDEN_CARROT, Rarity.COMMON),
     GOLD_NUGGET(Material.GOLD_NUGGET, Rarity.COMMON),

commons/src/main/java/net/swofty/commons/item/attribute/attributes/ItemAttributeHotPotatoBookData.java

@@ -15,7 +15,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.stream.IntStream;
 
 public class ItemAttributeHotPotatoBookData extends ItemAttribute<ItemAttributeHotPotatoBookData.HotPotatoBookData> {