part 1 of bestiary

Author: ItzKatze

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,91 @@ 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;
+    }
+     */
+
+    //TODO fix this stupid centering
+    public static List<String> centerLines(List<String> lines) {
+        int CHAT_WIDTH_PIXELS = 320;
+        int SPACE_WIDTH = 4; // Minecraft space width
+        List<String> centered = new ArrayList<>();
+
+        for (String line : lines) {
+            if (line.isEmpty()) {
+                centered.add(line);
+                continue;
+            }
+
+            boolean bold = false;
+            int pixelWidth = 0;
+            int formatCodeCount = 0;
+
+            // Calculate visible width and count format codes
+            for (int i = 0; i < line.length(); i++) {
+                char c = line.charAt(i);
+                if (c == '§' && i + 1 < line.length()) {
+                    char code = line.charAt(i + 1);
+                    if (code == 'l') bold = true;
+                    else if (code == 'r') bold = false;
+                    formatCodeCount += 2;
+                    i++; // Skip format code
+                    continue;
+                }
+                pixelWidth += getCharWidth(c, bold) + 1; // +1 for character spacing
+            }
+
+            // Subtract the last character's spacing
+            if (pixelWidth > 0) pixelWidth--;
+
+            // Calculate padding
+            int padding = (CHAT_WIDTH_PIXELS - pixelWidth) / 2;
+            int spaces = Math.max(0, padding / SPACE_WIDTH);
+
+            // Add extra space if needed (Minecraft rendering quirk)
+            if (padding % SPACE_WIDTH >= 2) {
+                spaces++;
+            }
+            System.out.printf("Line (%.3f px): %s\n", (float)pixelWidth, line.replace("§", "&"));
+
+            centered.add(" ".repeat(spaces) + line);
+        }
+
+        return centered;
+    }
+
+    private static int getCharWidth(char c, boolean bold) {
+        // Special case for certain characters
+        if (c == '➡') return 6; // Arrow character
+        if (c == '✯') return 7; // Star character
+
+        return switch (c) {
+            case ' ', 'I', '[', ']', 't' -> 4;
+            case '!', '.', ',', ':', ';', 'i', '|' -> 2;
+            case '\'', '`', 'l' -> 3;
+            case '*', 'f', 'k', '<', '>' -> 5;
+            case '§' -> 0;
+            default -> bold ? 6 : 5;
+        };
+    }
 }

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();