From 3e2713ddc3400677d48003db930045358f2d3c26 Mon Sep 17 00:00:00 2001
From: DaFuqs <dominik.m.schmidt@googlemail.com>
Date: Fri, 10 Mar 2023 15:01:30 +0100
Subject: [PATCH] unified the way upgradeable trinkets calculate their upgrade
 values. All now cap out at 3276800 Ink

---
 raw/UpgradeableTrinketsData.xlsx              | Bin 12261 -> 16759 bytes
 .../items/trinkets/AzureDikeAmuletItem.java   |  30 +++++-----
 .../items/trinkets/ExtraHealthRingItem.java   |  34 +++++------
 .../items/trinkets/ExtraReachGlovesItem.java  |  37 ++++++------
 .../items/trinkets/InkDrainTrinketItem.java   |  54 +++++++++---------
 5 files changed, 72 insertions(+), 83 deletions(-)

diff --git a/raw/UpgradeableTrinketsData.xlsx b/raw/UpgradeableTrinketsData.xlsx
index 5bbbc6c8d84d8111fdece7b50a92e6d1c2f67415..b827c601da66592adce95b45d883e6b39a673cc6 100644
GIT binary patch
delta 10301
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

delta 6612
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

diff --git a/src/main/java/de/dafuqs/spectrum/items/trinkets/AzureDikeAmuletItem.java b/src/main/java/de/dafuqs/spectrum/items/trinkets/AzureDikeAmuletItem.java
index 876fe40e81..990b403663 100644
--- a/src/main/java/de/dafuqs/spectrum/items/trinkets/AzureDikeAmuletItem.java
+++ b/src/main/java/de/dafuqs/spectrum/items/trinkets/AzureDikeAmuletItem.java
@@ -1,25 +1,23 @@
 package de.dafuqs.spectrum.items.trinkets;
 
-import de.dafuqs.spectrum.SpectrumCommon;
-import de.dafuqs.spectrum.energy.color.InkColors;
-import de.dafuqs.spectrum.energy.storage.FixedSingleInkStorage;
-import dev.emi.trinkets.api.SlotReference;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.item.TooltipContext;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
+import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.energy.color.*;
+import de.dafuqs.spectrum.energy.storage.*;
+import dev.emi.trinkets.api.*;
+import net.fabricmc.api.*;
+import net.minecraft.client.item.*;
+import net.minecraft.entity.*;
+import net.minecraft.item.*;
+import net.minecraft.text.*;
+import net.minecraft.world.*;
+import org.jetbrains.annotations.*;
 
-import java.util.List;
+import java.util.*;
 
 public class AzureDikeAmuletItem extends InkDrainTrinketItem implements AzureDikeItem {
 	
 	public AzureDikeAmuletItem(Settings settings) {
-		super(settings, SpectrumCommon.locate("progression/unlock_shieldgrasp_amulet"), InkColors.BLUE, 100L * (long) Math.pow(8, 18)); // 20 extra hearts (pretty much unobtainable)
+		super(settings, SpectrumCommon.locate("progression/unlock_shieldgrasp_amulet"), InkColors.BLUE);
 	}
 	
 	@Environment(EnvType.CLIENT)
@@ -72,7 +70,7 @@ public int getDike(long storedInk) {
 		if (storedInk < 100) {
 			return 0;
 		} else {
-			return 2 + (int) (Math.log(storedInk / 100) / Math.log(8));
+			return 1 + (int) (Math.log(storedInk / 100) / Math.log(8));
 		}
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/trinkets/ExtraHealthRingItem.java b/src/main/java/de/dafuqs/spectrum/items/trinkets/ExtraHealthRingItem.java
index 36ef9623f6..013f2aef15 100644
--- a/src/main/java/de/dafuqs/spectrum/items/trinkets/ExtraHealthRingItem.java
+++ b/src/main/java/de/dafuqs/spectrum/items/trinkets/ExtraHealthRingItem.java
@@ -1,29 +1,25 @@
 package de.dafuqs.spectrum.items.trinkets;
 
-import com.google.common.collect.Multimap;
-import de.dafuqs.spectrum.SpectrumCommon;
-import de.dafuqs.spectrum.energy.color.InkColors;
-import de.dafuqs.spectrum.energy.storage.FixedSingleInkStorage;
-import dev.emi.trinkets.api.SlotReference;
-import net.minecraft.client.item.TooltipContext;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.attribute.EntityAttribute;
-import net.minecraft.entity.attribute.EntityAttributeModifier;
-import net.minecraft.entity.attribute.EntityAttributes;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Formatting;
-import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
+import com.google.common.collect.*;
+import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.energy.color.*;
+import de.dafuqs.spectrum.energy.storage.*;
+import dev.emi.trinkets.api.*;
+import net.minecraft.client.item.*;
+import net.minecraft.entity.*;
+import net.minecraft.entity.attribute.*;
+import net.minecraft.item.*;
+import net.minecraft.text.*;
+import net.minecraft.util.*;
+import net.minecraft.world.*;
+import org.jetbrains.annotations.*;
 
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 public class ExtraHealthRingItem extends InkDrainTrinketItem {
 	
 	public ExtraHealthRingItem(Settings settings) {
-		super(settings, SpectrumCommon.locate("progression/unlock_heartsingers_reward"), InkColors.PINK, 13421772800L); // 20 extra hearts
+		super(settings, SpectrumCommon.locate("progression/unlock_heartsingers_reward"), InkColors.PINK);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/items/trinkets/ExtraReachGlovesItem.java b/src/main/java/de/dafuqs/spectrum/items/trinkets/ExtraReachGlovesItem.java
index 3d460eceaf..82a02ec43f 100644
--- a/src/main/java/de/dafuqs/spectrum/items/trinkets/ExtraReachGlovesItem.java
+++ b/src/main/java/de/dafuqs/spectrum/items/trinkets/ExtraReachGlovesItem.java
@@ -1,29 +1,26 @@
 package de.dafuqs.spectrum.items.trinkets;
 
-import com.google.common.collect.Multimap;
-import com.jamieswhiteshirt.reachentityattributes.ReachEntityAttributes;
-import de.dafuqs.spectrum.SpectrumCommon;
-import de.dafuqs.spectrum.energy.color.InkColors;
-import de.dafuqs.spectrum.energy.storage.FixedSingleInkStorage;
-import dev.emi.trinkets.api.SlotReference;
-import net.minecraft.client.item.TooltipContext;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.attribute.EntityAttribute;
-import net.minecraft.entity.attribute.EntityAttributeModifier;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Formatting;
-import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
+import com.google.common.collect.*;
+import com.jamieswhiteshirt.reachentityattributes.*;
+import de.dafuqs.spectrum.*;
+import de.dafuqs.spectrum.energy.color.*;
+import de.dafuqs.spectrum.energy.storage.*;
+import dev.emi.trinkets.api.*;
+import net.minecraft.client.item.*;
+import net.minecraft.entity.*;
+import net.minecraft.entity.attribute.*;
+import net.minecraft.item.*;
+import net.minecraft.text.*;
+import net.minecraft.util.*;
+import net.minecraft.world.*;
+import org.jetbrains.annotations.*;
 
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 public class ExtraReachGlovesItem extends InkDrainTrinketItem {
 	
 	public ExtraReachGlovesItem(Settings settings) {
-		super(settings, SpectrumCommon.locate("progression/unlock_gloves_of_dawns_grasp"), InkColors.LIGHT_BLUE, 1677721600); // 5 blocks of extra reach
+		super(settings, SpectrumCommon.locate("progression/unlock_gloves_of_dawns_grasp"), InkColors.LIGHT_BLUE);
 	}
 	
 	@Override
@@ -51,7 +48,7 @@ public double getExtraReach(long storedInk) {
 		if (storedInk < 100) {
 			return 0;
 		} else {
-			return 1 + roundHalf(Math.log(storedInk / 100) / Math.log(64));
+			return 0.5 + roundHalf(Math.log(storedInk / 100) / Math.log(64));
 		}
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/trinkets/InkDrainTrinketItem.java b/src/main/java/de/dafuqs/spectrum/items/trinkets/InkDrainTrinketItem.java
index 752fcccf2d..2ef0ad15c8 100644
--- a/src/main/java/de/dafuqs/spectrum/items/trinkets/InkDrainTrinketItem.java
+++ b/src/main/java/de/dafuqs/spectrum/items/trinkets/InkDrainTrinketItem.java
@@ -1,31 +1,31 @@
 package de.dafuqs.spectrum.items.trinkets;
 
-import de.dafuqs.spectrum.energy.InkStorageItem;
-import de.dafuqs.spectrum.energy.color.InkColor;
-import de.dafuqs.spectrum.energy.storage.FixedSingleInkStorage;
-import de.dafuqs.spectrum.helpers.Support;
-import net.minecraft.client.item.TooltipContext;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Formatting;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.Rarity;
-import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
+import de.dafuqs.spectrum.energy.*;
+import de.dafuqs.spectrum.energy.color.*;
+import de.dafuqs.spectrum.energy.storage.*;
+import de.dafuqs.spectrum.helpers.*;
+import net.minecraft.client.item.*;
+import net.minecraft.item.*;
+import net.minecraft.nbt.*;
+import net.minecraft.text.*;
+import net.minecraft.util.*;
+import net.minecraft.world.*;
+import org.jetbrains.annotations.*;
 
-import java.util.List;
+import java.util.*;
 
 public class InkDrainTrinketItem extends SpectrumTrinketItem implements InkStorageItem<FixedSingleInkStorage> {
 	
+	/**
+	 * TODO: set to the original value again, once ink networking is in. Currently the original max value cannot be achieved.
+	 * Players WILL grind out that amount of pigment in some way and will then complain
+	 */
+	public static final int MAX_INK = 3276800; // 1677721600;
 	public final InkColor inkColor;
-	public final long maxInk;
 	
-	public InkDrainTrinketItem(Settings settings, Identifier unlockIdentifier, InkColor inkColor, long maxInk) {
+	public InkDrainTrinketItem(Settings settings, Identifier unlockIdentifier, InkColor inkColor) {
 		super(settings, unlockIdentifier);
 		this.inkColor = inkColor;
-		this.maxInk = maxInk;
 	}
 	
 	@Override
@@ -35,7 +35,7 @@ public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> too
 		FixedSingleInkStorage inkStorage = getEnergyStorage(stack);
 		long storedInk = inkStorage.getEnergy(inkStorage.getStoredColor());
 		
-		if (storedInk == maxInk) {
+		if (storedInk >= MAX_INK) {
 			tooltip.add(new TranslatableText("spectrum.tooltip.ink_drain.tooltip.maxed_out").formatted(Formatting.GRAY));
 		} else {
 			long nextStepInk;
@@ -51,20 +51,18 @@ public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> too
 	
 	@Override
 	public boolean hasGlint(ItemStack stack) {
+		return isMaxedOut(stack);
+	}
+	
+	private boolean isMaxedOut(ItemStack stack) {
 		FixedSingleInkStorage inkStorage = getEnergyStorage(stack);
 		long storedInk = inkStorage.getEnergy(inkStorage.getStoredColor());
-		return storedInk == maxInk;
+		return storedInk >= MAX_INK;
 	}
 	
 	@Override
 	public Rarity getRarity(ItemStack stack) {
-		FixedSingleInkStorage inkStorage = getEnergyStorage(stack);
-		long storedInk = inkStorage.getEnergy(inkStorage.getStoredColor());
-		if (storedInk == maxInk) {
-			return Rarity.EPIC;
-		} else {
-			return super.getRarity(stack);
-		}
+		return isMaxedOut(stack) ? Rarity.EPIC : super.getRarity(stack);
 	}
 	
 	// Omitting this would crash outside the dev env o.O
@@ -84,7 +82,7 @@ public FixedSingleInkStorage getEnergyStorage(ItemStack itemStack) {
 		if (compound != null && compound.contains("EnergyStore")) {
 			return FixedSingleInkStorage.fromNbt(compound.getCompound("EnergyStore"));
 		}
-		return new FixedSingleInkStorage(maxInk, inkColor);
+		return new FixedSingleInkStorage(MAX_INK, inkColor);
 	}
 	
 	@Override