Skip to content

fix: bee cage name display bug when change language #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HowXu wants to merge 1 commit into
base: dev-1.21.0
Choose a base branch
from
Open

fix: bee cage name display bug when change language #774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/main/java/cy/jdkdigital/productivebees/common/item/BeeCage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import cy.jdkdigital.productivebees.common.entity.bee.ProductiveBee;
import cy.jdkdigital.productivebees.init.ModAdvancements;
import cy.jdkdigital.productivebees.util.BeeHelper;
import cy.jdkdigital.productivebees.ProductiveBees;
import net.minecraft.ChatFormatting;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.core.BlockPos;
Expand Down Expand Up @@ -216,10 +217,12 @@ public static Bee getEntityFromStack(CustomData data, Level world, boolean withI
public Component getName(ItemStack stack) {
if (!isFilled(stack)) {
return Component.translatable(this.getDescriptionId());
} else {
String typeId = ((CustomData) stack.get(DataComponents.CUSTOM_DATA)).copyTag().getString("type");
String entityId = ((CustomData) stack.get(DataComponents.CUSTOM_DATA)).copyTag().getString("entity");
// return Component.translatable(self.getDescriptionId()).append(Component.literal(" (" + entityId + ")"));
return Component.translatable(this.getDescriptionId()).append(Component.literal(" (")).append(getTranslationKey(typeId, entityId)).append(Component.literal(")"));
}

String entityId = stack.get(DataComponents.CUSTOM_DATA).copyTag().getString("name");
return Component.translatable(this.getDescriptionId()).append(Component.literal(" (" + entityId + ")"));
}

@Override
Expand All @@ -244,4 +247,27 @@ public void appendHoverText(ItemStack pStack, TooltipContext pContext, List<Comp
}
}
}

private Component getTranslationKey(String typeId, String entityId) {
boolean should_add_prefix = true;
String id;
if (entityId.equals(ProductiveBees.MODID + ":configurable_bee")) {
id = typeId;
} else {
id = entityId;
should_add_prefix = false;
}
String[] splits = id.split(":");
if (splits.length < 2) {
return Component.literal(id);
}
// gen an entity.productivebee.xxx_bee name from lang.json
Component translatable = Component.translatable("entity." + ProductiveBees.MODID + "." + (id.split(":"))[1] + (should_add_prefix ? "_bee" : ""));
// equal return or base return
if (translatable.getString().equals(id)) {
return Component.literal(id);
} else {
return translatable;
}
}
}