Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into beeper-creams

# Conflicts:
#	src/main/java/de/hysky/skyblocker/SkyblockerMod.java
#	src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java

Pull updates from upstream and NOT get a heart attack

1 files changed, 63 insertions, 0 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java
new file mode 100644
index 00000000..76073a2c
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java
@@ -0,0 +1,63 @@
+package de.hysky.skyblocker.mixin;
+
+
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.ItemUtils;
+import de.hysky.skyblocker.utils.ItemUtils.Durability;
+import de.hysky.skyblocker.utils.Utils;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.text.Text;
+
+@Mixin(ItemStack.class)
+public abstract class ItemStackMixin {
+	@Shadow
+	@Nullable
+	private NbtCompound nbt;
+
+	@ModifyReturnValue(method = "getName", at = @At("RETURN"))
+	private Text skyblocker$customItemNames(Text original) {
+		if (Utils.isOnSkyblock() && nbt != null && nbt.contains("ExtraAttributes"))  {
+			NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes");
+			String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
+
+			return SkyblockerConfigManager.get().general.customItemNames.getOrDefault(itemUuid, original);
+		}
+
+		return original;
+	}
+
+	@ModifyReturnValue(method = "getDamage", at = @At("RETURN"))
+	private int skyblocker$handleDamage(int original) {
+		Durability dur = ItemUtils.getDurability((ItemStack) (Object) this);
+		if (dur != null) {
+			return dur.max() - dur.current();
+		}
+		return original;
+	}
+
+	@ModifyReturnValue(method = "getMaxDamage", at = @At("RETURN"))
+	private int skyblocker$handleMaxDamage(int original) {
+		Durability dur = ItemUtils.getDurability((ItemStack) (Object) this);
+		if (dur != null) {
+			return dur.max();
+		}
+		return original;
+	}
+
+	@ModifyReturnValue(method = "isDamageable", at = @At("RETURN"))
+	private boolean skyblocker$handleDamageable(boolean original) {
+		Durability dur = ItemUtils.getDurability((ItemStack) (Object) this);
+		if (dur != null) {
+			return true;
+		}
+		return original;
+	}
+}