From e64e100af16e2b2bcbe9362f1b7685a7dc2cfd59 Mon Sep 17 00:00:00 2001 From: Jordy Goodridge Date: Mon, 3 Jun 2024 19:59:23 -0700 Subject: [PATCH] Fix spinel modifier --- .../data/tinkering_abnormally/tinkering/modifiers/spinel.json | 4 ++-- .../moe/hazu/tinkeringabnormally/data/ModifierProvider.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/generated/resources/data/tinkering_abnormally/tinkering/modifiers/spinel.json b/src/generated/resources/data/tinkering_abnormally/tinkering/modifiers/spinel.json index d848a52..85d83a1 100644 --- a/src/generated/resources/data/tinkering_abnormally/tinkering/modifiers/spinel.json +++ b/src/generated/resources/data/tinkering_abnormally/tinkering/modifiers/spinel.json @@ -20,13 +20,13 @@ { "type": "tconstruct:stat_boost", "flat": -0.25, - "operation": "multiply_conditional", + "operation": "multiply_base", "stat": "tconstruct:attack_damage" }, { "type": "tconstruct:stat_boost", "flat": -0.25, - "operation": "multiply_conditional", + "operation": "multiply_base", "stat": "tconstruct:mining_speed" } ], diff --git a/src/main/java/moe/hazu/tinkeringabnormally/data/ModifierProvider.java b/src/main/java/moe/hazu/tinkeringabnormally/data/ModifierProvider.java index c46c873..f7b67de 100644 --- a/src/main/java/moe/hazu/tinkeringabnormally/data/ModifierProvider.java +++ b/src/main/java/moe/hazu/tinkeringabnormally/data/ModifierProvider.java @@ -34,8 +34,8 @@ public class ModifierProvider extends AbstractModifierProvider implements ICondi .addModule(StatBoostModule.multiplyBase(ToolStats.DURABILITY).flat(-0.25f)) .addModule(new ModifierSlotModule(SlotType.UPGRADE, 2)) // melee harvest - .addModule(StatBoostModule.multiplyConditional(ToolStats.ATTACK_DAMAGE).flat(-0.25f)) - .addModule(StatBoostModule.multiplyConditional(ToolStats.MINING_SPEED).flat(-0.25f)); + .addModule(StatBoostModule.multiplyBase(ToolStats.ATTACK_DAMAGE).flat(-0.25f)) + .addModule(StatBoostModule.multiplyBase(ToolStats.MINING_SPEED).flat(-0.25f)); buildModifier(ModifierIds.necromium) .levelDisplay(ModifierLevelDisplay.NO_LEVELS) .addModule(ModifierRequirementsModule.builder().modifierKey(moe.hazu.tinkeringabnormally.data.ModifierIds.necromium).requireModifier(TinkerTags.Modifiers.GEMS, 1).displayModifier(slimeknights.tconstruct.tools.data.ModifierIds.diamond, 1).build())