Tweak impl. of modify_item_cooldown item action type

Now uses the item's old cooldown entry end tick value as the base value for the modifiers instead of the cooldown progress, which was a float clamped from 0.0 to 1.0
eggohito · Feb 13, 2024 · ba6b5b5 · ba6b5b5
1 parent e70bd2e
commit ba6b5b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/io/github/eggohito/eggolib/action/item/ModifyItemCooldownAction.java b/src/main/java/io/github/eggohito/eggolib/action/item/ModifyItemCooldownAction.java
@@ -35,8 +35,12 @@ public static void action(SerializableData.Instance data, Pair<World, ItemStack>
 		ItemCooldownManager cooldownManager = player.getItemCooldownManager();
 		Item item = stack.getItem();
 
-		double newCooldown = ModifierUtil.applyModifiers(player, modifiers, cooldownManager.getCooldownProgress(item, 0.0f));
-		cooldownManager.set(item, (int) Math.floor(newCooldown));
+		ItemCooldownManager.Entry cooldownEntry = cooldownManager.entries.get(item);
+
+		int oldCooldown = cooldownEntry != null ? cooldownEntry.endTick : 0;
+		int newCooldown = (int) ModifierUtil.applyModifiers(player, modifiers, oldCooldown);
+
+		cooldownManager.set(item, newCooldown);
 
 	}
 

diff --git a/src/main/resources/eggolib.accesswidener b/src/main/resources/eggolib.accesswidener
@@ -1,4 +1,4 @@
-accessWidener   v1  named
+accessWidener   v2  named
 
 extendable class net/minecraft/item/ItemStack
 mutable field net/minecraft/item/ItemStack item Lnet/minecraft/item/Item;
@@ -12,3 +12,6 @@ accessible class net/minecraft/server/command/AdvancementCommand$Selection
 accessible method net/minecraft/server/command/AdvancementCommand$Operation processEach (Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/advancement/Advancement;)Z
 accessible method net/minecraft/server/command/AdvancementCommand$Operation processEachCriterion (Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/advancement/Advancement;Ljava/lang/String;)Z
 extendable class net/minecraft/world/event/Vibrations$ListenerData
+accessible field net/minecraft/entity/player/ItemCooldownManager entries Ljava/util/Map;
+accessible class net/minecraft/entity/player/ItemCooldownManager$Entry
+accessible field net/minecraft/entity/player/ItemCooldownManager$Entry endTick I