Skip to content

Make Enchantment a ComponentLike #4229

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

Closed
MrHell228 wants to merge 1 commit into from
Closed

Make Enchantment a ComponentLike #4229

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion SpongeAPI
Open in desktop
Submodule SpongeAPI updated 1 files
+2 −1 src/main/java/org/spongepowered/api/item/enchantment/Enchantment.java
16 changes: 14 additions & 2 deletions src/main/java/org/spongepowered/common/item/enchantment/SpongeEnchantment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,22 @@
*/
package org.spongepowered.common.item.enchantment;

import net.kyori.adventure.text.Component;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.world.item.enchantment.Enchantment;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.data.persistence.DataContainer;
import org.spongepowered.api.data.persistence.Queries;
import org.spongepowered.api.item.enchantment.Enchantment;
import org.spongepowered.api.item.enchantment.EnchantmentType;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.common.SpongeCommon;
import org.spongepowered.common.adventure.SpongeAdventure;

import java.util.Objects;

public final class SpongeEnchantment implements Enchantment {
public final class SpongeEnchantment implements org.spongepowered.api.item.enchantment.Enchantment {

private final EnchantmentType enchantmentType;
private final int level;
Expand All @@ -54,6 +59,13 @@ public int level() {
return this.level;
}

@Override
public Component asComponent() {
final Registry<Enchantment> registry = (Registry<Enchantment>) SpongeCommon.scopedHolder().registry(RegistryTypes.ENCHANTMENT_TYPE);
final Holder<Enchantment> holder = registry.wrapAsHolder((Enchantment) (Object) this.enchantmentType);
return SpongeAdventure.asAdventure(Enchantment.getFullname(holder, this.level));
}

@Override
public int contentVersion() {
return 1;
Expand Down
Loading