chore: fixed crafting

Took 14 minutes

Author: Swofty-Developments

type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/GUICrafting.java

@@ -136,7 +136,7 @@ public void run(InventoryPreClickEvent e, SkyBlockPlayer player) {
                     }
                 }
                 if (isShift){
-                    // if is shift click add updated item to player inventory
+                    // if is a shift click add updated item to player inventory
                     e.setCancelled(true);
                     player.addAndUpdateItem(e.getClickedItem());
                 }

type.generic/src/main/java/net/swofty/types/generic/item/ItemQuantifiable.java

@@ -58,8 +58,8 @@ public SkyBlockItem toSkyBlockItem() {
         return item;
     }
 
-    public boolean matchesMaterial(SkyBlockItem item) {
-        return this.item.getMaterial() == item.getMaterial();
+    public boolean matchesType(SkyBlockItem item) {
+        return this.item.getAttributeHandler().getTypeAsString() == item.getAttributeHandler().getTypeAsString();
     }
 
     public String toString() {

type.generic/src/main/java/net/swofty/types/generic/item/crafting/ShapedRecipe.java

@@ -96,7 +96,7 @@ public SkyBlockItem[] consume(SkyBlockItem[] stacks) {
                                 break;
                             }
 
-                            if (stackMaterial.matchesMaterial(patternMaterial.getItem())
+                            if (stackMaterial.matchesType(patternMaterial.getItem())
                                     || ExchangeableType.isExchangeable(
                                             stackMaterial.getItem().getAttributeHandler().getPotentialType(),
                                             patternMaterial.getItem().getAttributeHandler().getPotentialType()
@@ -186,7 +186,7 @@ public Map<Character, List<Integer>> getPositionsOfItems(ItemStack[] stacks) {
                                 continue;
                             }
 
-                            if (stackMaterial.matchesMaterial(patternMaterial.getItem())
+                            if (stackMaterial.matchesType(patternMaterial.getItem())
                                     || ExchangeableType.isExchangeable(
                                             stackMaterial.getItem().getAttributeHandler().getPotentialType(),
                                             patternMaterial.getItem().getAttributeHandler().getPotentialType()
@@ -277,7 +277,7 @@ private static boolean matchesPattern(ShapedRecipe recipe, ItemStack[][] grid, i
                 ItemQuantifiable patternMaterial = recipe.getIngredientMap().get(patternChar);
                 ItemQuantifiable gridMaterial = ItemQuantifiable.of(grid[startRow + row][startCol + col]);
 
-                if (!gridMaterial.matchesMaterial(patternMaterial.getItem()) ||
+                if (!gridMaterial.matchesType(patternMaterial.getItem()) ||
                         gridMaterial.getAmount() < patternMaterial.getAmount()) {
                     if (!ExchangeableType.isExchangeable(gridMaterial.getItem().getAttributeHandler().getPotentialType(),
                             patternMaterial.getItem().getAttributeHandler().getPotentialType())) {

type.generic/src/main/java/net/swofty/types/generic/item/crafting/ShapelessRecipe.java

@@ -72,7 +72,7 @@ public SkyBlockItem[] consume(SkyBlockItem[] stacks) {
 
             ItemQuantifiable currentStackMaterial = ItemQuantifiable.of(modifiedStacks[i].getItemStack());
             ItemQuantifiable toConsume = materialsToConsume.stream()
-                    .filter(material -> material.matchesMaterial(currentStackMaterial.getItem())
+                    .filter(material -> material.matchesType(currentStackMaterial.getItem())
                             || ExchangeableType.isExchangeable(
                                     material.getItem().getAttributeHandler().getPotentialType(),
                                     currentStackMaterial.getItem().getAttributeHandler().getPotentialType()
@@ -174,7 +174,7 @@ public static ShapelessRecipe parseShapelessRecipe(ItemStack[] stacks) {
 
                     materialsPassedThrough.forEach(material -> {
                         ItemQuantifiable found = materialsNeeded.stream()
-                                .filter(needed -> needed.matchesMaterial(material.getItem())
+                                .filter(needed -> needed.matchesType(material.getItem())
                                         || ExchangeableType.isExchangeable(
                                                 needed.getItem().getAttributeHandler().getPotentialType(),
                                                 material.getItem().getAttributeHandler().getPotentialType()

type.generic/src/main/java/net/swofty/types/generic/minion/IslandMinionData.java

@@ -87,7 +87,7 @@ public boolean addItem(SkyBlockItem item) {
 
             // Check if the item already exists in the inventory.
             Optional<ItemQuantifiable> existingItem = itemsInMinion.stream()
-                    .filter(materialQuantifiable -> materialQuantifiable.matchesMaterial(item))
+                    .filter(materialQuantifiable -> materialQuantifiable.matchesType(item))
                     .findFirst();
 
             if (existingItem.isPresent()) {

velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerPlayerHandler.java

@@ -6,6 +6,7 @@
 import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
 import net.swofty.commons.Configuration;
 import net.swofty.commons.ServerType;
+import net.swofty.commons.StringUtility;
 import net.swofty.commons.proxy.FromProxyChannels;
 import net.swofty.commons.proxy.ToProxyChannels;
 import net.swofty.commons.proxy.requirements.to.PlayerHandlerRequirements;
@@ -87,7 +88,7 @@ public JSONObject receivedMessage(JSONObject message, UUID serverUUID) {
                         || new TransferHandler(player).isInLimbo()
                         || !GameManager.isAnyEmpty(type)) {
                     player.sendMessage(Component.text(
-                            "§cAttempted to transfer to an " + type.name() + " server, but there are no empty slots available. Please try again later."
+                            "§cAttempted to transfer to a(n) " + StringUtility.toNormalCase(type.name()) + " server, but there are no empty slots available. Please try again later."
                     ));
                     return new JSONObject();
                 }