Merge pull request #528 from ItzKatze/master

updated velocity to 1.21.8

Author: Swofty-Developments

README.md

@@ -3,7 +3,7 @@
 
 [<img src="https://discordapp.com/assets/e4923594e694a21542a489471ecffa50.svg" alt="" height="55" />](https://discord.gg/paper)
 
-A 1.8 to 1.21.4 recreation of HypixelSkyBlock utilizing Minestom, with the intention of actually having a properly abstracted, scalable codebase. This project is sisters with the [HypixelForums](https://github.com/Swofty-Developments/HypixelForums) project and optionally, can be used together.
+A 1.8 to 1.21.8 recreation of HypixelSkyBlock utilizing Minestom, with the intention of actually having a properly abstracted, scalable codebase. This project is sisters with the [HypixelForums](https://github.com/Swofty-Developments/HypixelForums) project and optionally, can be used together.
 
 #### Releases
 
@@ -33,15 +33,15 @@ A video of me going through the guide [can be found here](https://www.youtube.co
 
 ### Proxy Setup Guide
 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)
+2. Download the Velocity proxy from [here](https://fill-data.papermc.io/v1/objects/303f9c60d5d75c52585c9e95efbc46d43ae8683efe7dee8763a16d6506681ee1/velocity-3.4.0-SNAPSHOT-528.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 as well, 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-528.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.
 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.
-10. Start the proxy again using `java -jar velocity-3.4.0-SNAPSHOT-463.jar`. This will need to be on for your game servers to work.
+10. Start the proxy again using `java -jar velocity-3.4.0-SNAPSHOT-528.jar`. This will need to be on for your game servers to work.
 
 ### Game Server Setup Guide
 1. Download 'SkyBlockCore.jar' from the releases page [here](https://github.com/Swofty-Developments/HypixelSkyBlock/releases/tag/latest)

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

@@ -35,7 +35,7 @@ public HotPotatoBookData loadFromString(String string) {
         JSONObject obj = new JSONObject(string);
 
         PotatoType potatoType = null;
-        if (obj.has("potatoType")){
+        if (obj.has("potatoType")) {
             potatoType = obj.getEnum(PotatoType.class, "potatoType");
         }
 
@@ -87,22 +87,22 @@ public static class HotPotatoBookData {
         private HashMap<ItemType, Integer> appliedItems = new HashMap<>();
 
         public void addAmount(ItemType itemType, int amount) {
-            if (!appliedItems.containsKey(itemType)){
+            if (!appliedItems.containsKey(itemType)) {
                 appliedItems.put(itemType, amount);
             }else{
                 appliedItems.put(itemType, appliedItems.get(itemType) + amount);
             }
         }
 
-        public int getAmount(ItemType type){
+        public int getAmount(ItemType type) {
             return appliedItems.getOrDefault(type, 0);
         }
 
-        public boolean hasAppliedItem(ItemType itemType){
+        public boolean hasAppliedItem(ItemType itemType) {
             return appliedItems.containsKey(itemType) && appliedItems.get(itemType) > 0;
         }
 
-        public boolean hasAppliedItem(){
+        public boolean hasAppliedItem() {
             return appliedItems.values().stream().mapToInt(Integer::intValue).sum() > 0;
         }
     }

spark/src/main/java/net/swofty/spark/MinestomCommandSender.java

@@ -43,7 +43,7 @@ public void sendMessage(Component message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        if (delegate instanceof Player player){
+        if (delegate instanceof Player player) {
             return HypixelGenericLoader.getFromUUID(player.getUuid()).getDataHandler()
                     .get(HypixelDataHandler.Data.RANK, DatapointRank.class)
                     .getValue() == Rank.ADMIN;

type.generic/src/main/java/net/swofty/type/generic/user/HypixelPlayer.java

@@ -79,7 +79,7 @@ public AntiCheatHandler getAntiCheatHandler() {
         return new AntiCheatHandler(this);
     }
 
-    public PlayerSkin getPlayerSkin(){
+    public PlayerSkin getPlayerSkin() {
         String texture = getDataHandler().get(HypixelDataHandler.Data.SKIN_TEXTURE , DatapointString.class).getValue();
         String signature = getDataHandler().get(HypixelDataHandler.Data.SKIN_SIGNATURE , DatapointString.class).getValue();
         return new PlayerSkin(texture , signature);

type.generic/src/main/java/net/swofty/type/generic/utility/BlockUtility.java

@@ -6,7 +6,7 @@
 
 public class BlockUtility {
 
-    public static Block applyTexture(Block block , String texture){
+    public static Block applyTexture(Block block , String texture) {
         JSONObject json = new JSONObject();
         json.put("isPublic", true);
         json.put("signatureRequired", false);

type.hub/src/main/java/net/swofty/type/hub/villagers/VillagerBlacksmith.java

@@ -50,7 +50,7 @@ public void onClick(PlayerClickVillagerNPCEvent e) {
             });
             return;
         }
-        if  (!data.hasCompleted(MissionMineCoal.class)) {
+        if (!data.hasCompleted(MissionMineCoal.class)) {
             player.sendMessage("§e[NPC] Blacksmith§f: Retrieve 10 coal from the Coal Mines!");
             return;
         }

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,

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")) {

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/commands/MithrilInfuseCommand.java

@@ -21,7 +21,7 @@ public void registerUsage(MinestomCommand command) {
         command.addSyntax((sender, context) -> {
             if (!permissionCheck(sender)) return;
             SkyBlockPlayer player = ((SkyBlockPlayer) sender);
-            if(!(new SkyBlockItem(player.getItemInMainHand()).hasComponent(MinionComponent.class))){
+            if (!(new SkyBlockItem(player.getItemInMainHand()).hasComponent(MinionComponent.class))) {
                 player.sendMessage("§cMithril Infusions can only be applied to minions.");
                 return;
             }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/blocks/ActionBlockPlaceable.java

@@ -14,7 +14,7 @@
 public class ActionBlockPlaceable implements HypixelEventClass {
 
     @HypixelEvent(node = EventNodes.PLAYER , requireDataLoaded = true)
-    public void onPlace(PlayerBlockPlaceEvent event){
+    public void onPlace(PlayerBlockPlaceEvent event) {
         ItemStack itemStack = event.getPlayer().getItemInMainHand();
         SkyBlockItem item = new SkyBlockItem(itemStack);
         SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
@@ -25,7 +25,7 @@ public void onPlace(PlayerBlockPlaceEvent event){
             PlaceableComponent placeable = item.getComponent(PlaceableComponent.class);
             if (placeable.getBlockType() == null) return;
             SkyBlockBlock skyBlockBlock = new SkyBlockBlock(placeable.getBlockType());
-            if (skyBlockBlock.getGenericInstance() instanceof BlockPlaceable blockPlaceable){
+            if (skyBlockBlock.getGenericInstance() instanceof BlockPlaceable blockPlaceable) {
                 blockPlaceable.onPlace(event, skyBlockBlock);
             }
         }