Skip to content

Commit cab368c

Browse files
committed
Fix accidentally having free runners give soul speed, as movement efficiency negates the slowdown already
1 parent cdb106f commit cab368c

File tree

1 file changed

+0
-35
lines changed

1 file changed

+0
-35
lines changed

src/main/java/mekanism/common/item/gear/ItemFreeRunners.java

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import io.netty.buffer.ByteBuf;
55
import java.util.List;
66
import java.util.Locale;
7-
import java.util.Optional;
87
import java.util.function.Consumer;
98
import java.util.function.IntFunction;
109
import mekanism.api.IIncrementalEnum;
@@ -24,8 +23,6 @@
2423
import mekanism.common.registries.MekanismDataComponents;
2524
import mekanism.common.util.StorageUtils;
2625
import net.minecraft.core.Holder;
27-
import net.minecraft.core.Holder.Reference;
28-
import net.minecraft.core.HolderLookup.RegistryLookup;
2926
import net.minecraft.core.component.DataComponentType;
3027
import net.minecraft.network.chat.Component;
3128
import net.minecraft.network.codec.ByteBufCodecs;
@@ -45,9 +42,6 @@
4542
import net.minecraft.world.item.ItemStack;
4643
import net.minecraft.world.item.Rarity;
4744
import net.minecraft.world.item.TooltipFlag;
48-
import net.minecraft.world.item.enchantment.Enchantment;
49-
import net.minecraft.world.item.enchantment.Enchantments;
50-
import net.minecraft.world.item.enchantment.ItemEnchantments;
5145
import net.neoforged.neoforge.event.ItemAttributeModifierEvent;
5246
import org.jetbrains.annotations.NotNull;
5347

@@ -97,35 +91,6 @@ public int getBarColor(@NotNull ItemStack stack) {
9791
return MekanismConfig.client.energyColor.get();
9892
}
9993

100-
private int getFakeEnchantmentLevel(@NotNull ItemStack stack, @NotNull Holder<Enchantment> enchantment) {
101-
if (enchantment.is(Enchantments.SOUL_SPEED) && getMode(stack) == FreeRunnerMode.NORMAL) {
102-
return 1;
103-
}
104-
return 0;
105-
}
106-
107-
@Override
108-
public int getEnchantmentLevel(@NotNull ItemStack stack, @NotNull Holder<Enchantment> enchantment) {
109-
return Math.max(getFakeEnchantmentLevel(stack, enchantment), super.getEnchantmentLevel(stack, enchantment));
110-
}
111-
112-
@NotNull
113-
@Override
114-
public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack, @NotNull RegistryLookup<Enchantment> lookup) {
115-
ItemEnchantments enchantments = super.getAllEnchantments(stack, lookup);
116-
Optional<Reference<Enchantment>> enchantment = lookup.get(Enchantments.SOUL_SPEED);
117-
if (enchantment.isPresent()) {
118-
Holder<Enchantment> soulSpeed = enchantment.get();
119-
int fakeLevel = getFakeEnchantmentLevel(stack, soulSpeed);
120-
if (enchantments.getLevel(soulSpeed) < fakeLevel) {
121-
ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(enchantments);
122-
mutable.set(soulSpeed, fakeLevel);
123-
return mutable.toImmutable();
124-
}
125-
}
126-
return enchantments;
127-
}
128-
12994
@Override
13095
public DataComponentType<FreeRunnerMode> getModeDataType() {
13196
return MekanismDataComponents.FREE_RUNNER_MODE.get();

0 commit comments

Comments
 (0)