Merge pull request #495 from ItzKatze/master

feat: Bestiary

Author: Swofty-Developments

README.md

@@ -77,7 +77,7 @@ A video of me going through the guide [can be found here](https://www.youtube.co
 4. Once this has finished, you should have a resource pack in the output directory you specified. Merely apply this on Minecraft and you'll be good to go.
 
 
-# 🐋 Running with Docker
+## 🐋 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:
@@ -135,16 +135,28 @@ or go to the `exec` tab in Docker Desktop.
 and then run the service command inside there. It will create its own screen session for you to run the service in.
 
 
-### Common Issues
+## Common Issues
 1. `redis.clients.jedis.exceptions.JedisConnectionException: Failed to connect to any host resolved for DNS name.`
 
     => Your Memurai isn't running.
 2. `Preview features are not enabled for... Try running with '--enable-preview'`
 
     => try `java --enable-preview -jar SkyBlockCore.jar {ServerType}`
+3. Having issues connecting to the server?
+
+    => Check if your velocity secret is the same everywhere including the limbo config.
+
+4. `You have strayed too far from the spawn! Teleporting you back...` when joining an island?
+
+    => You didn't import your regions (correctly).
+
+5. Still having issues? 
+
+    => Make sure that you followed everything correctly. If that didn't help, join our discord and ask for help in #code-help. Please provide screenshots of all your consoles! 
+### Pinging staff members won't solve your issue faster!
 
 ## Credits
 
 Thanks to:
 * All the lovely people in the Minestom discord for single-handedly carrying all of my knowledge about this API.
-* Myself and any other contributors, which can be viewed on this Git page.
+* Myself and any other contributors, who can be viewed [HERE](https://github.com/Swofty-Developments/HypixelSkyBlock/graphs/contributors).

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

@@ -5,6 +5,7 @@
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.item.Material;
+import net.swofty.commons.statistics.ItemStatistic;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
@@ -275,4 +276,25 @@ public static String ntify(int i) {
             };
         };
     }
+
+    public static String getFormatedStatistic(ItemStatistic statistic) {
+        return statistic.getDisplayColor() + statistic.getSymbol() + " " + statistic.getDisplayName();
+    }
+
+    public static List<String> centerLines(List<String> lines) {
+        int maxLength = lines.stream()
+                .map(StringUtility::stripColor)
+                .mapToInt(String::length)
+                .max()
+                .orElse(0);
+
+        List<String> centered = new ArrayList<>();
+        for (String line : lines) {
+            String stripped = stripColor(line);
+            int padding = Math.max(0, (maxLength - stripped.length()) / 2);
+            centered.add(" ".repeat(padding) + line);
+        }
+
+        return centered;
+    }
 }

configuration/collections/mining.yml

@@ -302,6 +302,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: LOOTING_DISCOUNT
   - amount: 500
     rewards:
     - type: XP

configuration/items/vanillaItems.yml

@@ -5094,6 +5094,8 @@ items:
             result:
               type: DIAMOND_SWORD
               amount: 1
+      - id: STANDARD_ITEM
+        standard_item_type: SWORD
     default_statistics:
       damage: 35.0
   - id: GOLDEN_SWORD
@@ -5120,6 +5122,8 @@ items:
             result:
               type: GOLDEN_SWORD
               amount: 1
+      - id: STANDARD_ITEM
+        standard_item_type: SWORD
     default_statistics:
       damage: 20.0
   - id: IRON_SWORD
@@ -5146,6 +5150,8 @@ items:
             result:
               type: IRON_SWORD
               amount: 1
+      - id: STANDARD_ITEM
+        standard_item_type: SWORD
     default_statistics:
       damage: 30.0
   - id: STONE_SWORD
@@ -5172,6 +5178,8 @@ items:
             result:
               type: STONE_SWORD
               amount: 1
+      - id: STANDARD_ITEM
+        standard_item_type: SWORD
     default_statistics:
       damage: 25.0
   - id: WOODEN_SWORD
@@ -5198,6 +5206,8 @@ items:
             result:
               type: WOODEN_SWORD
               amount: 1
+      - id: STANDARD_ITEM
+        standard_item_type: SWORD
     default_statistics:
       damage: 20.0
   - id: BREWING_STAND

type.generic/src/main/java/net/swofty/types/generic/SkyBlockGenericLoader.java

@@ -219,11 +219,12 @@ public void initialize(MinecraftServer server) {
         /**
          * Register entities
          */
-        typeLoader.getMobs().forEach(mob -> {
-            MobRegistry.registerExtraMob(mob.getEntityType(), mob.getClazz());
-        });
+        loopThroughPackage("net.swofty.types.generic.entity.mob.mobs", SkyBlockMob.class)
+                .forEach(mob -> MobRegistry.registerExtraMob(mob.getClass()));
+
         MathUtility.delay(() -> SkyBlockMob.runRegionPopulators(MinecraftServer.getSchedulerManager()), 50);
 
+
         /**
          * Handle server attributes
          */

type.generic/src/main/java/net/swofty/types/generic/SkyBlockTypeLoader.java

@@ -31,8 +31,6 @@ public interface SkyBlockTypeLoader {
     List<SkyBlockEventClass> getTraditionalEvents();
     List<SkyBlockEventClass> getCustomEvents();
 
-    List<MobRegistry> getMobs();
-
     List<SkyBlockNPC> getNPCs();
 
     List<SkyBlockVillagerNPC> getVillagerNPCs();