GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Move to using a map for Java-only enchantments.

Browse source
This commit is contained in:
Tyler Rife 2024-05-10 16:27:12 -06:00
parent 3785b346dd
commit 44b1715916
1 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

33
core/src/main/java/org/geysermc/geyser/item/type/Item.java
View file

@ -53,6 +53,16 @@ import java.util.List;
import java.util.Map;
public class Item {
/**
* This is a map from Java-only enchantments to their translation keys so that we can
* map these enchantments to Bedrock clients, since they don't actually exist there.
*/
private static final Map<Enchantment.JavaEnchantment, String> ENCHANTMENT_TRANSLATION_KEYS = Map.of(
Enchantment.JavaEnchantment.SWEEPING_EDGE, "enchantment.minecraft.sweeping",
Enchantment.JavaEnchantment.DENSITY, "enchantment.minecraft.density",
Enchantment.JavaEnchantment.BREACH, "enchantment.minecraft.breach",
Enchantment.JavaEnchantment.WIND_BURST, "enchantment.minecraft.wind_burst");
private final String javaIdentifier;
private int javaId = -1;
private final int stackSize;
@ -227,25 +237,10 @@ public class Item {
// TODO verify
// TODO streamline Enchantment process
Enchantment.JavaEnchantment enchantment = Enchantment.JavaEnchantment.of(enchantId);
if (enchantment == Enchantment.JavaEnchantment.SWEEPING_EDGE) {
String sweepingTranslation = MinecraftLocale.getLocaleString("enchantment.minecraft.sweeping", session.locale());
addJavaOnlyEnchantment(session, builder, sweepingTranslation, level);
return null;
}
if (enchantment == Enchantment.JavaEnchantment.DENSITY) {
String densityTranslation = MinecraftLocale.getLocaleString("enchantment.minecraft.density", session.locale());
addJavaOnlyEnchantment(session, builder, densityTranslation, level);
return null;
}
if (enchantment == Enchantment.JavaEnchantment.BREACH) {
String breachTranslation = MinecraftLocale.getLocaleString("enchantment.minecraft.breach", session.locale());
addJavaOnlyEnchantment(session, builder, breachTranslation, level);
return null;
}
if (enchantment == Enchantment.JavaEnchantment.WIND_BURST) {
String windBurstTranslation = MinecraftLocale.getLocaleString("enchantment.minecraft.wind_burst", session.locale());
addJavaOnlyEnchantment(session, builder, windBurstTranslation, level);
return null;
if (ENCHANTMENT_TRANSLATION_KEYS.containsKey(enchantment)) {
String translationKey = ENCHANTMENT_TRANSLATION_KEYS.get(enchantment);
String enchantmentTranslation = MinecraftLocale.getLocaleString(translationKey, session.locale());
addJavaOnlyEnchantment(session, builder, enchantmentTranslation, level);
}
if (enchantment == null) {
GeyserImpl.getInstance().getLogger().debug("Unknown Java enchantment while NBT item translating: " + enchantId);