Skip to content

Allow custom items with repairable to be repaired #6505

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

Merged
valaphee merged 3 commits into from
Jul 10, 2026
+15 −24
Merged

Allow custom items with repairable to be repaired #6505

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7283e38
Make repairable behave like Java Edition
valaphee Jul 4, 2026
7bf88ab
Handle it server-side
valaphee Jul 4, 2026
77e3ee6
Add TODO for repairable properties restriction
valaphee Jul 10, 2026
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
83 changes: 61 additions & 22 deletions core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.Equippable;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.FoodProperties;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.HolderSet;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.KineticWeapon;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.PiercingWeapon;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.SwingAnimation;
Expand Down Expand Up @@ -253,6 +254,9 @@ private static NbtMapBuilder createComponentNbt(Key itemIdentifier, CustomItemCo

setupBasicItemInfo(context.definition(), context.components(), itemProperties, componentBuilder);

// Add a base item tag to the item, as in Java Edition they are still the same items and that we can behave the same in Bedrock
context.vanillaMapping().ifPresent(mapping -> addItemTag(componentBuilder, "geyser:" + mapping.getBedrockIdentifier()));

computeToolProperties(itemProperties, componentBuilder);
Integer attackDamage = context.definition().components().get(GeyserItemDataComponents.ATTACK_DAMAGE);
if (attackDamage != null) {
Expand All @@ -266,10 +270,9 @@ private static NbtMapBuilder createComponentNbt(Key itemIdentifier, CustomItemCo
boolean canDestroyInCreative = toolData == null || toolData.isCanDestroyBlocksInCreative();
computeCreativeDestroyProperties(canDestroyInCreative, itemProperties, componentBuilder);

// Using API component here because MCPL one is just an ID holder set, and we can't get identifiers from that
JavaRepairable repairable = context.definition().components().get(JavaItemDataComponents.REPAIRABLE);
HolderSet repairable = context.components().get(DataComponentTypes.REPAIRABLE);
if (repairable != null) {
computeRepairableProperties(repairable, componentBuilder);
computeRepairableProperties(repairable, componentBuilder, context.vanillaMapping().map(GeyserMappingItem::getBedrockIdentifier).orElse(null));
}
Comment on lines +270 to 273

Equippable equippable = context.components().get(DataComponentTypes.EQUIPPABLE);
Expand Down Expand Up @@ -444,12 +447,12 @@ private static void setupBasicItemInfo(CustomItemDefinition definition, DataComp
componentBuilder.putCompound("minecraft:display_name", NbtMap.builder().putString("value", definition.displayName()).build());

// Add a Geyser tag to the item, allowing Molang queries
addItemTag(componentBuilder, Identifier.of("geyser:is_custom"));
addItemTag(componentBuilder, "geyser:is_custom");

// Add other defined tags to the item
Set<Identifier> tags = options.tags();
for (Identifier tag : tags) {
addItemTag(componentBuilder, tag);
addItemTag(componentBuilder, tag.toString());
}

itemProperties.putBoolean("allow_off_hand", options.allowOffhand());
Expand Down Expand Up @@ -518,21 +521,57 @@ private static void computeCreativeDestroyProperties(boolean canDestroyInCreativ
/**
* This method passes the Java identifiers straight to bedrock - which isn't perfect. Also doesn't work with holder sets that use a tag.
*/
private static void computeRepairableProperties(JavaRepairable repairable, NbtMapBuilder componentBuilder) {
List<Identifier> identifiers = ((HoldersImpl) repairable.items()).identifiers();
if (identifiers == null) {
return;
private static void computeRepairableProperties(HolderSet repairable, NbtMapBuilder componentBuilder, String baseItem) {
// TODO also map individual items and do not hardcode tag mappings
List<NbtMap> items = repairable.getLocation() != null ? switch (repairable.getLocation().asString()) {
case "minecraft:wooden_tool_materials" -> List.of(NbtMap.builder()
.putString("tags", "q.all_tags('minecraft:planks')")
.build());
case "minecraft:repairs_leather_armor" -> List.of(NbtMap.builder()
.putString("name", "minecraft:leather")
.build());
case "minecraft:iron_tool_materials", "minecraft:repairs_iron_armor" -> List.of(NbtMap.builder()
.putString("name", "minecraft:iron_ingot")
.build());
case "minecraft:gold_tool_materials", "minecraft:repairs_gold_armor" -> List.of(NbtMap.builder()
.putString("name", "minecraft:gold_ingot")
.build());
case "minecraft:diamond_tool_materials", "minecraft:repairs_diamond_armor" -> List.of(NbtMap.builder()
.putString("name", "minecraft:diamond")
.build());
case "minecraft:netherite_tool_materials", "minecraft:repairs_netherite_armor" -> List.of(NbtMap.builder()
.putString("name", "minecraft:netherite_ingot")
.build());
default -> List.of(NbtMap.builder()
.putString("tags", "q.all_tags('" + repairable.getLocation().asString() + "')")
.build());
} : null;

List<NbtMap> repairItems = new ArrayList<>();
if (baseItem != null) {
repairItems.add(NbtMap.builder()
.putList("items", NbtType.COMPOUND, NbtMap.builder()
.putString("name", baseItem)
.build(), NbtMap.builder()
.putString("tags", "q.all_tags('geyser:" + baseItem + "')")
.build())
.putCompound("repair_amount", NbtMap.builder()
.putString("expression", "math.min(q.remaining_durability + c.other->q.remaining_durability + math.floor(q.max_durability * 0.05), q.max_durability)")
.putShort("version", (short) 12)
.build())
.build());
}
List<NbtMap> items = identifiers.stream()
.map(identifier -> NbtMap.builder()
.putString("name", identifier.toString())
.build()).toList();

componentBuilder.putCompound("minecraft:repairable", NbtMap.builder()
.putList("repair_items", NbtType.COMPOUND, NbtMap.builder()
if (items != null) {
repairItems.add(NbtMap.builder()
.putList("items", NbtType.COMPOUND, items)
.putFloat("repair_amount", 0.0F)
.build())
.putCompound("repair_amount", NbtMap.builder()
.putString("expression", "q.max_durability * 0.25")
.putShort("version", (short) 12)
.build())
.build());
}
componentBuilder.putCompound("minecraft:repairable", NbtMap.builder()
.putList("repair_items", NbtType.COMPOUND, repairItems)
.build());
Comment on lines +518 to 527
}

Expand Down Expand Up @@ -744,15 +783,15 @@ private static boolean isUnbreakableItem(CustomItemDefinition definition) {
}

@SuppressWarnings("unchecked")
private static void addItemTag(NbtMapBuilder builder, Identifier tag) {
private static void addItemTag(NbtMapBuilder builder, String tag) {
List<String> tagList = (List<String>) builder.get("item_tags");
if (tagList == null) {
builder.putList("item_tags", NbtType.STRING, tag.toString());
builder.putList("item_tags", NbtType.STRING, tag);
} else {
// NbtList is immutable
if (!tagList.contains(tag.toString())) {
if (!tagList.contains(tag)) {
tagList = new ArrayList<>(tagList);
tagList.add(tag.toString());
tagList.add(tag);
builder.putList("item_tags", NbtType.STRING, tagList);
}
}
Expand Down
Loading