Merge branch 'master' into better-durability

6 files changed, 257 insertions, 4 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java
index 91be5248..ea54ff32 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java
@@ -160,7 +160,7 @@ public class DungeonChestProfit {
 
 	private static Text getProfitText(int profit, boolean hasIncompleteData) {
 		SkyblockerConfig.DungeonChestProfit config = SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit;
-		return getProfitText(profit, hasIncompleteData, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting);
+		return getProfitText(profit, hasIncompleteData, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor);
 	}
 
 	static Text getProfitText(int profit, boolean hasIncompleteData, int neutralThreshold, Formatting neutralColor, Formatting profitColor, Formatting lossColor, Formatting incompleteColor) {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
index dba066a5..6eb0623c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
@@ -8,7 +8,7 @@ import dev.isxander.yacl3.config.v2.api.SerialEntry;
 import it.unimi.dsi.fastutil.Pair;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
-import me.xmrvizzy.skyblocker.utils.SkyblockEvents;
+import me.xmrvizzy.skyblocker.events.SkyblockEvents;
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/ItemCooldowns.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/ItemCooldowns.java
new file mode 100644
index 00000000..dbe0c16e
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/ItemCooldowns.java
@@ -0,0 +1,115 @@
+package me.xmrvizzy.skyblocker.skyblock.item;
+
+import com.google.common.collect.ImmutableList;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
+import me.xmrvizzy.skyblocker.events.ClientPlayerBlockBreakEvent;
+import me.xmrvizzy.skyblocker.utils.ItemUtils;
+import net.fabricmc.fabric.api.event.player.UseItemCallback;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.util.Hand;
+import net.minecraft.util.TypedActionResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ItemCooldowns {
+    private static final String JUNGLE_AXE_ID = "JUNGLE_AXE";
+    private static final String TREECAPITATOR_ID = "TREECAPITATOR_AXE";
+    private static final String GRAPPLING_HOOK_ID = "GRAPPLING_HOOK";
+    private static final ImmutableList<String> BAT_ARMOR_IDS = ImmutableList.of("BAT_PERSON_HELMET", "BAT_PERSON_CHESTPLATE", "BAT_PERSON_LEGGINGS", "BAT_PERSON_BOOTS");
+
+    private static final Map<String, CooldownEntry> ITEM_COOLDOWNS = new HashMap<>();
+
+    public static void init() {
+        ClientPlayerBlockBreakEvent.AFTER.register(ItemCooldowns::afterBlockBreak);
+        UseItemCallback.EVENT.register(ItemCooldowns::onItemInteract);
+    }
+
+    public static void afterBlockBreak(World world, PlayerEntity player, BlockPos pos, BlockState state) {
+        if (!SkyblockerConfigManager.get().general.itemCooldown.enableItemCooldowns) return;
+
+        String usedItemId = ItemUtils.getItemId(player.getMainHandStack());
+        if (usedItemId == null) return;
+
+        if (state.isIn(BlockTags.LOGS)) {
+            if (usedItemId.equals(JUNGLE_AXE_ID)) {
+                if (!isOnCooldown(JUNGLE_AXE_ID)) {
+                    ITEM_COOLDOWNS.put(JUNGLE_AXE_ID, new CooldownEntry(2000));
+                }
+            } else if (usedItemId.equals(TREECAPITATOR_ID)) {
+                if (!isOnCooldown(TREECAPITATOR_ID)) {
+                    ITEM_COOLDOWNS.put(TREECAPITATOR_ID, new CooldownEntry(2000));
+                }
+            }
+        }
+    }
+
+    private static TypedActionResult<ItemStack> onItemInteract(PlayerEntity player, World world, Hand hand) {
+        if (!SkyblockerConfigManager.get().general.itemCooldown.enableItemCooldowns) return TypedActionResult.pass(ItemStack.EMPTY);
+
+        String usedItemId = ItemUtils.getItemId(player.getMainHandStack());
+        if (usedItemId != null && usedItemId.equals(GRAPPLING_HOOK_ID) && player.fishHook != null) {
+            if (!isOnCooldown(GRAPPLING_HOOK_ID) && !isWearingBatArmor(player)) {
+                ITEM_COOLDOWNS.put(GRAPPLING_HOOK_ID, new CooldownEntry(2000));
+            }
+        }
+
+        return TypedActionResult.pass(ItemStack.EMPTY);
+    }
+
+    public static boolean isOnCooldown(ItemStack itemStack) {
+        return isOnCooldown(ItemUtils.getItemId(itemStack));
+    }
+
+    private static boolean isOnCooldown(String itemId) {
+        if (ITEM_COOLDOWNS.containsKey(itemId)) {
+            CooldownEntry cooldownEntry = ITEM_COOLDOWNS.get(itemId);
+            if (cooldownEntry.isOnCooldown()) {
+                return true;
+            } else {
+                ITEM_COOLDOWNS.remove(itemId);
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    public static CooldownEntry getItemCooldownEntry(ItemStack itemStack) {
+        return ITEM_COOLDOWNS.get(ItemUtils.getItemId(itemStack));
+    }
+
+    private static boolean isWearingBatArmor(PlayerEntity player) {
+        for (ItemStack stack : player.getArmorItems()) {
+            String itemId = ItemUtils.getItemId(stack);
+            if (!BAT_ARMOR_IDS.contains(itemId)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public record CooldownEntry(int cooldown, long startTime) {
+        public CooldownEntry(int cooldown) {
+            this(cooldown, System.currentTimeMillis());
+        }
+
+        public boolean isOnCooldown() {
+            return (this.startTime + this.cooldown) > System.currentTimeMillis();
+        }
+
+        public long getRemainingCooldown() {
+            long time = (this.startTime + this.cooldown) - System.currentTimeMillis();
+            return Math.max(time, 0);
+        }
+
+        public float getRemainingCooldownPercent() {
+            return this.isOnCooldown() ? (float) this.getRemainingCooldown() / cooldown : 0.0f;
+        }
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/ItemRarityBackgrounds.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/ItemRarityBackgrounds.java
new file mode 100644
index 00000000..837c209a
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/ItemRarityBackgrounds.java
@@ -0,0 +1,109 @@
+package me.xmrvizzy.skyblocker.skyblock.item;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import com.google.common.collect.ImmutableMap;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap;
+import me.xmrvizzy.skyblocker.SkyblockerMod;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
+import me.xmrvizzy.skyblocker.utils.Utils;
+import me.xmrvizzy.skyblocker.utils.scheduler.Scheduler;
+import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+public class ItemRarityBackgrounds {
+	private static final Identifier RARITY_BG_TEX = new Identifier(SkyblockerMod.NAMESPACE, "item_rarity_background");
+	private static final Supplier<Sprite> SPRITE = () -> MinecraftClient.getInstance().getGuiAtlasManager().getSprite(RARITY_BG_TEX);
+	private static final ImmutableMap<String, SkyblockItemRarity> LORE_RARITIES = ImmutableMap.ofEntries(
+			Map.entry("ADMIN", SkyblockItemRarity.ADMIN),
+			Map.entry("SPECIAL", SkyblockItemRarity.SPECIAL), //Very special is the same color so this will cover it
+			Map.entry("DIVINE", SkyblockItemRarity.DIVINE),
+			Map.entry("MYTHIC", SkyblockItemRarity.MYTHIC),
+			Map.entry("LEGENDARY", SkyblockItemRarity.LEGENDARY),
+			Map.entry("LEGENJERRY", SkyblockItemRarity.LEGENDARY),
+			Map.entry("EPIC", SkyblockItemRarity.EPIC),
+			Map.entry("RARE", SkyblockItemRarity.RARE),
+			Map.entry("UNCOMMON", SkyblockItemRarity.UNCOMMON),
+			Map.entry("COMMON", SkyblockItemRarity.COMMON)
+	);
+	private static final Int2ReferenceOpenHashMap<SkyblockItemRarity> CACHE = new Int2ReferenceOpenHashMap<>();
+	
+	public static void init() {
+		//Clear the cache every 5 minutes, ints are very compact!
+		Scheduler.INSTANCE.scheduleCyclic(CACHE::clear, 4800);
+		
+		//Clear cache after a screen where items can be upgraded in rarity closes
+		ScreenEvents.BEFORE_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
+			String title = screen.getTitle().getString();
+			
+			if (Utils.isOnSkyblock() && (title.equals("The Hex") || title.equals("Craft Item") || title.equals("Anvil") || title.equals("Reforge Anvil"))) {
+				ScreenEvents.remove(screen).register(screen1 -> CACHE.clear());
+			}
+		});
+	}
+	
+	public static void tryDraw(ItemStack stack, DrawContext context, int x, int y) {
+		MinecraftClient client = MinecraftClient.getInstance();
+		
+		if (client.player != null) {
+			SkyblockItemRarity itemRarity = getItemRarity(stack, client.player);
+			
+			if (itemRarity != null) draw(context, x, y, itemRarity);
+		}
+	}
+
+	private static SkyblockItemRarity getItemRarity(ItemStack stack, ClientPlayerEntity player) {
+		if (stack == null || stack.isEmpty()) return null;
+		
+		int hashCode = 0;
+		NbtCompound nbt = stack.getNbt();
+		
+		if (nbt != null && nbt.contains("ExtraAttributes")) {
+			NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes");
+			String itemUuid = extraAttributes.getString("uuid");
+			
+			//If the item has an uuid, then use the hash code of the uuid otherwise use the identity hash code of the stack
+			hashCode = itemUuid.isEmpty() ? System.identityHashCode(stack) : itemUuid.hashCode();
+		}
+
+		if (CACHE.containsKey(hashCode)) return CACHE.get(hashCode);
+				
+		List<Text> tooltip = stack.getTooltip(player, TooltipContext.BASIC);
+		String[] stringifiedTooltip = tooltip.stream().map(Text::getString).toArray(String[]::new);
+		
+		for (String rarityString : LORE_RARITIES.keySet()) {
+			if (Arrays.stream(stringifiedTooltip).anyMatch(line -> line.contains(rarityString))) {
+				SkyblockItemRarity rarity = LORE_RARITIES.get(rarityString);
+				
+				CACHE.put(hashCode, rarity);
+				return rarity;
+			}
+		}
+		
+		CACHE.put(hashCode, null);
+		return null;
+	}
+	
+	private static void draw(DrawContext context, int x, int y, SkyblockItemRarity rarity) {
+		//Enable blending to handle HUD translucency
+		RenderSystem.enableBlend();
+		RenderSystem.defaultBlendFunc();
+
+		context.drawSprite(x, y, 0, 16, 16, SPRITE.get(), rarity.r, rarity.g, rarity.b, SkyblockerConfigManager.get().general.itemInfoDisplay.itemRarityBackgroundsOpacity);
+		
+		RenderSystem.disableBlend();
+	}
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/SkyblockItemRarity.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/SkyblockItemRarity.java
new file mode 100644
index 00000000..f7ff1fb9
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/SkyblockItemRarity.java
@@ -0,0 +1,29 @@
+package me.xmrvizzy.skyblocker.skyblock.item;
+
+import net.minecraft.util.Formatting;
+
+public enum SkyblockItemRarity {
+	ADMIN(Formatting.DARK_RED),
+	VERY_SPECIAL(Formatting.RED),
+	SPECIAL(Formatting.RED),
+	DIVINE(Formatting.AQUA),
+	MYTHIC(Formatting.LIGHT_PURPLE),
+	LEGENDARY(Formatting.GOLD),
+	EPIC(Formatting.DARK_PURPLE),
+	RARE(Formatting.BLUE),
+	UNCOMMON(Formatting.GREEN),
+	COMMON(Formatting.WHITE);
+	
+	public final float r;
+	public final float g;
+	public final float b;
+
+	SkyblockItemRarity(Formatting formatting) {
+		@SuppressWarnings("DataFlowIssue")
+		int rgb = formatting.getColorValue();
+
+		this.r = ((rgb >> 16) & 0xFF) / 255f;
+		this.g = ((rgb >> 8) & 0xFF) / 255f;
+		this.b = (rgb & 0xFF) / 255f;
+	}
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
index 19f656e5..61a9aa20 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
@@ -15,7 +15,7 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
 public class ResultButtonWidget extends ClickableWidget {
-    private static final Identifier BACKGROUND_TEXTURE = new Identifier("textures/gui/recipe_book.png");
+    private static final Identifier BACKGROUND_TEXTURE = new Identifier("recipe_book/slot_craftable");
 
     protected ItemStack itemStack = null;
 
@@ -38,7 +38,7 @@ public class ResultButtonWidget extends ClickableWidget {
     public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) {
         MinecraftClient client = MinecraftClient.getInstance();
         // this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height);
-        context.drawTexture(BACKGROUND_TEXTURE, this.getX(), this.getY(), 29, 206, this.getWidth(), this.getHeight());
+        context.drawGuiTexture(BACKGROUND_TEXTURE, this.getX(), this.getY(), this.getWidth(), this.getHeight());
         // client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4);
         context.drawItem(this.itemStack, this.getX() + 4, this.getY() + 4);
         // client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.x + 4, this.y + 4);