New Message Feedback Prefix

5 files changed, 29 insertions, 24 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java
index 1496c90f..509f79b7 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java
@@ -4,6 +4,7 @@ import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -34,7 +35,7 @@ public class CustomArmorDyeColors {
 		ItemStack heldItem = source.getPlayer().getMainHandStack();
 
 		if (hex != null && !isHexadecimalColor(hex)) {
-			source.sendError(Text.translatable("skyblocker.customDyeColors.invalidHex"));
+			source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customDyeColors.invalidHex")));
 			return Command.SINGLE_SUCCESS;
 		}
 
@@ -49,24 +50,24 @@ public class CustomArmorDyeColors {
 						if (customDyeColors.containsKey(itemUuid)) {
 							customDyeColors.removeInt(itemUuid);
 							SkyblockerConfigManager.save();
-							source.sendFeedback(Text.translatable("skyblocker.customDyeColors.removed"));
+							source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.customDyeColors.removed")));
 						} else {
-							source.sendFeedback(Text.translatable("skyblocker.customDyeColors.neverHad"));
+							source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.customDyeColors.neverHad")));
 						}
 					} else {
 						customDyeColors.put(itemUuid, Integer.decode("0x" + hex.replace("#", "")).intValue());
 						SkyblockerConfigManager.save();
-						source.sendFeedback(Text.translatable("skyblocker.customDyeColors.added"));
+						source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.customDyeColors.added")));
 					}
 				} else {
-					source.sendError(Text.translatable("skyblocker.customDyeColors.noItemUuid"));
+					source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customDyeColors.noItemUuid")));
 				}
 			} else {
-				source.sendError(Text.translatable("skyblocker.customDyeColors.notDyeable"));
+				source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customDyeColors.notDyeable")));
 				return Command.SINGLE_SUCCESS;
 			}
 		} else {
-			source.sendError(Text.translatable("skyblocker.customDyeColors.unableToSetColor"));
+			source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customDyeColors.unableToSetColor")));
 		}
 
 		return Command.SINGLE_SUCCESS;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
index ff9e13c9..cec84b38 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
@@ -8,6 +8,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.events.SkyblockEvents;
+import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
@@ -108,32 +109,32 @@ public class CustomArmorTrims {
 						if (customArmorTrims.containsKey(itemUuid)) {
 							customArmorTrims.remove(itemUuid);
 							SkyblockerConfigManager.save();
-							source.sendFeedback(Text.translatable("skyblocker.customArmorTrims.removed"));
+							source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.customArmorTrims.removed")));
 						} else {
-							source.sendFeedback(Text.translatable("skyblocker.customArmorTrims.neverHad"));
+							source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.customArmorTrims.neverHad")));
 						}
 					} else {
 						// Ensure that the material & trim are valid
 						ArmorTrimId trimId = new ArmorTrimId(material, pattern);
 						if (TRIMS_CACHE.get(trimId) == null) {
-							source.sendError(Text.translatable("skyblocker.customArmorTrims.invalidMaterialOrPattern"));
+							source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customArmorTrims.invalidMaterialOrPattern")));
 
 							return Command.SINGLE_SUCCESS;
 						}
 
 						customArmorTrims.put(itemUuid, trimId);
 						SkyblockerConfigManager.save();
-						source.sendFeedback(Text.translatable("skyblocker.customArmorTrims.added"));
+						source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.customArmorTrims.added")));
 					}
 				} else {
-					source.sendError(Text.translatable("skyblocker.customArmorTrims.noItemUuid"));
+					source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customArmorTrims.noItemUuid")));
 				}
 			} else {
-				source.sendError(Text.translatable("skyblocker.customArmorTrims.notAnArmorPiece"));
+				source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customArmorTrims.notAnArmorPiece")));
 				return Command.SINGLE_SUCCESS;
 			}
 		} else {
-			source.sendError(Text.translatable("skyblocker.customArmorTrims.unableToSetTrim"));
+			source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customArmorTrims.unableToSetTrim")));
 		}
 
 		return Command.SINGLE_SUCCESS;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomItemNames.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomItemNames.java
index b6213eb6..e47444cf 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomItemNames.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomItemNames.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.skyblock.item;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -42,9 +43,9 @@ public class CustomItemNames {
 						//Remove custom item name when the text argument isn't passed
 						customItemNames.remove(itemUuid);
 						SkyblockerConfigManager.save();
-						source.sendFeedback(Text.translatable("skyblocker.customItemNames.removed"));
+						source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.customItemNames.removed")));
 					} else {
-						source.sendFeedback(Text.translatable("skyblocker.customItemNames.neverHad"));
+						source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.customItemNames.neverHad")));
 					}
 				} else {
 					//If the text is provided then set the item's custom name to it
@@ -55,13 +56,13 @@ public class CustomItemNames {
 
 					customItemNames.put(itemUuid, text);
 					SkyblockerConfigManager.save();
-					source.sendFeedback(Text.translatable("skyblocker.customItemNames.added"));
+					source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.customItemNames.added")));
 				}
 			} else {
-				source.sendError(Text.translatable("skyblocker.customItemNames.noItemUuid"));
+				source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customItemNames.noItemUuid")));
 			}
 		} else {
-			source.sendError(Text.translatable("skyblocker.customItemNames.unableToSetName"));
+			source.sendError(Constants.PREFIX.get().append(Text.translatable("skyblocker.customItemNames.unableToSetName")));
 		}
 
 		return Command.SINGLE_SUCCESS;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemProtection.java b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemProtection.java
index ff88ef8d..2d929c28 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemProtection.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemProtection.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.skyblock.item;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
@@ -44,18 +45,18 @@ public class ItemProtection {
 					protectedItems.add(itemUuid);
 					SkyblockerConfigManager.save();
 
-					source.sendFeedback(Text.translatable("skyblocker.itemProtection.added", heldItem.getName()));
+					source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.itemProtection.added", heldItem.getName())));
 				} else {
 					protectedItems.remove(itemUuid);
 					SkyblockerConfigManager.save();
 
-					source.sendFeedback(Text.translatable("skyblocker.itemProtection.removed", heldItem.getName()));
+					source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.itemProtection.removed", heldItem.getName())));
 				}
 			} else {
-				source.sendFeedback(Text.translatable("skyblocker.itemProtection.noItemUuid"));
+				source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.itemProtection.noItemUuid")));
 			}
 		} else {
-			source.sendFeedback(Text.translatable("skyblocker.itemProtection.unableToProtect"));
+			source.sendFeedback(Constants.PREFIX.get().append(Text.translatable("skyblocker.itemProtection.unableToProtect")));
 		}
 
 		return Command.SINGLE_SUCCESS;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/PriceInfoTooltip.java
index 0f84deea..0885ae6b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -4,6 +4,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.Http;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
@@ -196,7 +197,7 @@ public class PriceInfoTooltip {
 
     private static void nullWarning() {
         if (!nullMsgSend && client.player != null) {
-            client.player.sendMessage(Text.translatable("skyblocker.itemTooltip.nullMessage"), false);
+            client.player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.itemTooltip.nullMessage")), false);
             nullMsgSend = true;
         }
     }