Skip to content

Commit ed7fa95

Browse files
committed
Fix Emi Alias Provider enchantment lang key compile errors
1 parent 727f383 commit ed7fa95

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

src/datagen/main/java/mekanism/client/integration/emi/MekanismEmiAliasProvider.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Map;
66
import java.util.concurrent.CompletableFuture;
77
import mekanism.api.annotations.NothingNullByDefault;
8+
import mekanism.api.text.IHasTranslationKey;
89
import mekanism.client.integration.MekanismAliases;
910
import mekanism.common.Mekanism;
1011
import mekanism.common.content.blocktype.FactoryType;
@@ -22,8 +23,10 @@
2223
import net.minecraft.Util;
2324
import net.minecraft.core.HolderLookup;
2425
import net.minecraft.data.PackOutput;
26+
import net.minecraft.resources.ResourceKey;
2527
import net.minecraft.world.effect.MobEffects;
2628
import net.minecraft.world.item.Items;
29+
import net.minecraft.world.item.enchantment.Enchantment;
2730
import net.minecraft.world.item.enchantment.Enchantments;
2831

2932
@NothingNullByDefault
@@ -58,9 +61,9 @@ private void addUnitAliases() {
5861
addAliases(MekanismItems.MODULE_RADIATION_SHIELDING, MekanismAliases.RADIATION_PROTECTION);
5962
addAliases(MekanismItems.MODULE_ENERGY, MekanismAliases.ENERGY_STORAGE);
6063

61-
addAliases(MekanismItems.MODULE_FORTUNE, Enchantments.FORTUNE::getDescriptionId);
62-
addAliases(MekanismItems.MODULE_ATTACK_AMPLIFICATION, MekanismAliases.UNIT_DAMAGE, Enchantments.SHARPNESS::getDescriptionId);
63-
addAliases(MekanismItems.MODULE_EXCAVATION_ESCALATION, MekanismAliases.UNIT_DIG_SPEED, Enchantments.EFFICIENCY::getDescriptionId);
64+
addAliases(MekanismItems.MODULE_FORTUNE, getTranslationKey(Enchantments.FORTUNE));
65+
addAliases(MekanismItems.MODULE_ATTACK_AMPLIFICATION, MekanismAliases.UNIT_DAMAGE, getTranslationKey(Enchantments.SHARPNESS));
66+
addAliases(MekanismItems.MODULE_EXCAVATION_ESCALATION, MekanismAliases.UNIT_DIG_SPEED, getTranslationKey(Enchantments.EFFICIENCY));
6467
addAliases(MekanismItems.MODULE_BLASTING, MekanismAliases.TOOL_HAMMER, MekanismAliases.UNIT_AOE, MekanismAliases.UNIT_AOE_LONG);
6568
addAliases(MekanismItems.MODULE_FARMING, MekanismAliases.TOOL_AXE, MekanismAliases.TOOL_HOE, MekanismAliases.TOOL_SHOVEL);
6669

@@ -70,10 +73,14 @@ private void addUnitAliases() {
7073
addAliases(MekanismItems.MODULE_GRAVITATIONAL_MODULATING, MekanismAliases.CREATIVE_FLIGHT);
7174
addAliases(MekanismItems.MODULE_CHARGE_DISTRIBUTION, MekanismAliases.ITEM_CHARGER);
7275
addAliases(MekanismItems.MODULE_HYDRAULIC_PROPULSION, MekanismAliases.AUTO_STEP, MekanismAliases.STEP_ASSIST, MobEffects.JUMP.value()::getDescriptionId);
73-
addAliases(MekanismItems.MODULE_HYDROSTATIC_REPULSOR, MekanismAliases.UNIT_HYDROSTATIC_SPEED, Enchantments.DEPTH_STRIDER::getDescriptionId);
74-
addAliases(MekanismItems.MODULE_MOTORIZED_SERVO, Enchantments.SWIFT_SNEAK::getDescriptionId);
76+
addAliases(MekanismItems.MODULE_HYDROSTATIC_REPULSOR, MekanismAliases.UNIT_HYDROSTATIC_SPEED, getTranslationKey(Enchantments.DEPTH_STRIDER));
77+
addAliases(MekanismItems.MODULE_MOTORIZED_SERVO, getTranslationKey(Enchantments.SWIFT_SNEAK));
7578
addAliases(MekanismItems.MODULE_LOCOMOTIVE_BOOSTING, MobEffects.MOVEMENT_SPEED.value()::getDescriptionId);
76-
addAliases(MekanismItems.MODULE_SOUL_SURFER, Enchantments.SOUL_SPEED::getDescriptionId);
79+
addAliases(MekanismItems.MODULE_SOUL_SURFER, getTranslationKey(Enchantments.SOUL_SPEED));
80+
}
81+
82+
private IHasTranslationKey getTranslationKey(ResourceKey<Enchantment> enchantmentKey) {
83+
return () -> Util.makeDescriptionId("enchantment", enchantmentKey.location());
7784
}
7885

7986
private void addFactoryAliases() {

0 commit comments

Comments
 (0)