24w09a

1 files changed, 21 insertions, 37 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/special/SpecialEffects.java b/src/main/java/de/hysky/skyblocker/skyblock/special/SpecialEffects.java
index bc4f98c2..8e10086f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/special/SpecialEffects.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/special/SpecialEffects.java
@@ -1,42 +1,24 @@
 package de.hysky.skyblocker.skyblock.special;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.render.RenderHelper;
 import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.nbt.StringNbtReader;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.text.Text;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class SpecialEffects {
 	private static final Logger LOGGER = LoggerFactory.getLogger(SpecialEffects.class);
 	private static final Pattern DROP_PATTERN = Pattern.compile("(?:\\[[A-Z+]+] )?(?<player>[A-Za-z0-9_]+) unlocked (?<item>.+)!");
-	private static final ItemStack NECRON_HANDLE = new ItemStack(Items.STICK);
-	private static final ItemStack SCROLL = new ItemStack(Items.WRITABLE_BOOK);
-	private static ItemStack TIER_5_SKULL;
-	private static ItemStack FIFTH_STAR;
-
-	static {
-		NECRON_HANDLE.addEnchantment(Enchantments.PROTECTION, 1);
-		SCROLL.addEnchantment(Enchantments.PROTECTION, 1);
-		try {
-			TIER_5_SKULL = ItemStack.fromNbt(StringNbtReader.parse("{id:\"minecraft:player_head\",Count:1,tag:{SkullOwner:{Id:[I;-1613868903,-527154034,-1445577520,748807544],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTEwZjlmMTA4NWQ0MDcxNDFlYjc3NjE3YTRhYmRhYWEwOGQ4YWYzM2I5NjAyMDBmZThjMTI2YzFkMTQ0NTY4MiJ9fX0=\"}]}}}}"));
-			FIFTH_STAR = ItemStack.fromNbt(StringNbtReader.parse("{id:\"minecraft:player_head\",Count:1,tag:{SkullOwner:{Id:[I;1904417095,756174249,-1302927470,1407004198],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzFjODA0MjUyN2Y4MWM4ZTI5M2UyODEwMTEzNDg5ZjQzOTRjYzZlZmUxNWQxYWZhYzQzMTU3MWM3M2I2MmRjNCJ9fX0=\"}]}}}}"));
-		} catch (Exception e) {
-			TIER_5_SKULL = ItemStack.EMPTY;
-			FIFTH_STAR = ItemStack.EMPTY;
-			LOGGER.error("[Skyblocker Special Effects] Failed to parse NBT for a player head!", e);
-		}
-	}
 
 	public static void init() {
 		ClientReceiveMessageEvents.GAME.register(SpecialEffects::displayRareDropEffect);
@@ -45,7 +27,7 @@ public class SpecialEffects {
 	private static void displayRareDropEffect(Text message, boolean overlay) {
 		//We don't check if we're in dungeons because that check doesn't work in m7 which defeats the point of this
 		//It might also allow it to work with Croesus
-		if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.specialEffects.rareDungeonDropEffects) {
+		if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.specialEffects.rareDungeonDropEffects && !overlay) {
 			try {
 				String stringForm = message.getString();
 				Matcher matcher = DROP_PATTERN.matcher(stringForm);
@@ -57,7 +39,7 @@ public class SpecialEffects {
 					if (player.equals(client.getSession().getUsername())) {
 						ItemStack stack = getStackFromName(matcher.group("item"));
 
-						if (!stack.isEmpty()) {
+						if (stack != null && !stack.isEmpty()) {
 							RenderHelper.runOnRenderThread(() -> {
 								client.particleManager.addEmitter(client.player, ParticleTypes.PORTAL, 30);
 								client.gameRenderer.showFloatingItem(stack);
@@ -72,20 +54,22 @@ public class SpecialEffects {
 	}
 
 	private static ItemStack getStackFromName(String itemName) {
-		return switch (itemName) {
+		String itemId = switch (itemName) {
 			//M7
-			case "Necron Dye" -> new ItemStack(Items.ORANGE_DYE);
-			case "Dark Claymore" -> new ItemStack(Items.STONE_SWORD);
-			case "Necron's Handle", "Shiny Necron's Handle" -> NECRON_HANDLE;
-			case "Enchanted Book (Thunderlord VII)" -> new ItemStack(Items.ENCHANTED_BOOK);
-			case "Master Skull - Tier 5" -> TIER_5_SKULL;
-			case "Shadow Warp", "Wither Shield", "Implosion" -> SCROLL;
-			case "Fifth Master Star" -> FIFTH_STAR;
+			case "Necron Dye" -> "NECRON_DYE";
+			case "Dark Claymore" -> "DARK_CLAYMORE";
+			case "Necron's Handle", "Shiny Necron's Handle" -> "NECRON_HANDLE";
+			case "Enchanted Book (Thunderlord VII)" -> "ENCHANTED_BOOK";
+			case "Master Skull - Tier 5" -> "MASTER_SKULL_TIER_5";
+			case "Shadow Warp", "Wither Shield", "Implosion" -> "IMPLOSION_SCROLL";
+			case "Fifth Master Star" -> "FIFTH_MASTER_STAR";
 
 			//M6
-			case "Giant's Sword" -> new ItemStack(Items.IRON_SWORD);
+			case "Giant's Sword" -> "GIANTS_SWORD";
 
-			default -> ItemStack.EMPTY;
+			default -> "NONE";
 		};
+		
+		return ItemRepository.getItemStack(itemId);
 	}
 }