From 935ccd14bb6462de3f0b8b7834747669586c25b6 Mon Sep 17 00:00:00 2001
From: micle <micle@micle.dev>
Date: Sun, 11 Jan 2026 00:20:54 +0100
Subject: [PATCH] Implemented new methods for each totem item. Implemented
 helper for generating item properties, now also adding totem data to the
 item.

---
 .../item/totem/DiamondTotemItem.java           |  7 ++++++-
 .../item/totem/IronTotemItem.java              |  8 +++++++-
 .../item/totem/NetheriteTotemItem.java         |  8 ++++----
 .../item/totem/StrawTotemItem.java             |  7 ++++++-
 .../totemofreviving/item/totem/TotemItem.java  | 18 +++++++++++++-----
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java
index 9e33a7e..21089d8 100644
--- a/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java
+++ b/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java
@@ -7,7 +7,7 @@ import net.minecraft.world.item.Rarity;
 
 public class DiamondTotemItem extends TotemItem {
 	public DiamondTotemItem() {
-		super(Rarity.RARE, Config.Server.getDiamondTotemConfig().getDurability());
+		super(createProperties(Rarity.RARE, Config.Server.getDiamondTotemConfig().getDurability(), false));
 	}
 	
 	public static String getName() {
@@ -18,4 +18,9 @@ public class DiamondTotemItem extends TotemItem {
 	public boolean isCharge(ItemStack stack) {
 		return (stack.getItem() instanceof DiamondChargeItem);
 	}
+
+	@Override
+	public Config.TotemConfig getConfig() {
+		return Config.Server.getDiamondTotemConfig();
+	}
 }
diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java
index 1e574aa..1f7f2f1 100644
--- a/src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java
+++ b/src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java
@@ -3,10 +3,11 @@ package dev.micle.totemofreviving.item.totem;
 import dev.micle.totemofreviving.item.charge.IronChargeItem;
 import dev.micle.totemofreviving.setup.Config;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Rarity;
 
 public class IronTotemItem extends TotemItem {
 	public IronTotemItem() {
-		super(Config.Server.getIronTotemConfig().getDurability());
+		super(createProperties(Rarity.COMMON, Config.Server.getIronTotemConfig().getDurability(), false));
 	}
 	
 	public static String getName() {
@@ -17,4 +18,9 @@ public class IronTotemItem extends TotemItem {
 	public boolean isCharge(ItemStack stack) {
 		return (stack.getItem() instanceof IronChargeItem);
 	}
+
+	@Override
+	public Config.TotemConfig getConfig() {
+		return Config.Server.getIronTotemConfig();
+	}
 }
diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java
index f538324..c74464d 100644
--- a/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java
+++ b/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java
@@ -7,7 +7,7 @@ import net.minecraft.world.item.Rarity;
 
 public class NetheriteTotemItem extends TotemItem {
 	public NetheriteTotemItem() {
-		super(Rarity.EPIC, Config.Server.getNetheriteTotemConfig().getDurability());
+		super(createProperties(Rarity.EPIC, Config.Server.getNetheriteTotemConfig().getDurability(), true));
 	}
 	
 	public static String getName() {
@@ -18,9 +18,9 @@ public class NetheriteTotemItem extends TotemItem {
 	public boolean isCharge(ItemStack stack) {
 		return (stack.getItem() instanceof NetheriteChargeItem);
 	}
-	
+
 	@Override
-	public boolean isFireResistant() {
-		return true;
+	public Config.TotemConfig getConfig() {
+		return Config.Server.getNetheriteTotemConfig();
 	}
 }
diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java
index c731c54..e5d226c 100644
--- a/src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java
+++ b/src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java
@@ -7,7 +7,7 @@ import net.minecraft.world.item.Rarity;
 
 public class StrawTotemItem extends TotemItem {
 	public StrawTotemItem() {
-		super(Rarity.UNCOMMON, Config.Server.getStrawTotemConfig().getDurability());
+		super(createProperties(Rarity.UNCOMMON, Config.Server.getStrawTotemConfig().getDurability(), false));
 	}
 	
 	public static String getName() {
@@ -18,4 +18,9 @@ public class StrawTotemItem extends TotemItem {
 	public boolean isCharge(ItemStack stack) {
 		return (stack.getItem() instanceof StrawChargeItem);
 	}
+
+	@Override
+	public Config.TotemConfig getConfig() {
+		return Config.Server.getStrawTotemConfig();
+	}
 }
diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java
index c468756..2249149 100644
--- a/src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java
+++ b/src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java
@@ -30,12 +30,20 @@ import java.util.Optional;
 import java.util.UUID;
 
 public abstract class TotemItem extends Item {
-	public TotemItem(int durability) {
-		this(Rarity.COMMON, durability);
+	public TotemItem(Properties properties) {
+		super(properties);
 	}
-	
-	public TotemItem(Rarity rarity, int durability) {
-		super(new Properties().stacksTo(1).rarity(rarity).durability(durability));
+
+	public static Properties createProperties(Rarity rarity, int durability, boolean isFireResistant) {
+		Properties properties = new Properties().stacksTo(1).rarity(rarity).durability(durability);
+
+		if (isFireResistant) properties = properties.fireResistant();
+
+		properties = properties.component(ModDataComponents.TOTEM_DATA.get(), new TotemData(
+				0, "", "", 0, 0
+		));
+
+		return properties;
 	}
 
 	public abstract boolean isCharge(ItemStack stack);