Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@

import com.github.jikoo.planarenchanting.util.EnchantData.Provider;
import org.bukkit.enchantments.Enchantment;
import org.jetbrains.annotations.ApiStatus.Internal;
import org.jspecify.annotations.NullMarked;

/**
* An {@link Provider EnchantData.Provider} wrapping a platform-dependent provider.
*/
@Internal
@NullMarked
class DelegateEnchantProvider implements Provider {
public class DelegateEnchantProvider implements Provider {

private final Provider delegate =
ServerCapabilities.DATA_COMPONENT ? new ComponentEnchantProvider() : new MetaEnchantProvider();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
import org.bukkit.inventory.ItemStack;
import org.jspecify.annotations.NullMarked;

/**
* A {@link Temperer} for {@link DataComponentType DataComponent}-based operations.
*/
@NullMarked
class ComponentTemperer implements Temperer<ItemStack> {
public class ComponentTemperer implements Temperer<ItemStack> {

static final ComponentTemperer INSTANCE = new ComponentTemperer();
public static final ComponentTemperer INSTANCE = new ComponentTemperer();

@Override
public boolean hasChanged(ItemStack base, ItemStack addition, ItemStack result) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
import org.bukkit.inventory.view.AnvilView;
import org.jspecify.annotations.NullMarked;

/**
* A {@link ViewState} for raw item access.
*/
@NullMarked
class ComponentViewState implements ViewState<ItemStack> {
public class ComponentViewState implements ViewState<ItemStack> {

private final AnvilView view;
private final ItemStack base;
private final ItemStack addition;

ComponentViewState(AnvilView view) {
public ComponentViewState(AnvilView view) {
this.view = view;
ItemStack stack = view.getItem(0);
this.base = stack != null ? stack : ItemStack.empty();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
import com.github.jikoo.planarenchanting.util.EnchantData.Provider;
import io.papermc.paper.registry.keys.ItemTypeKeys;
import org.bukkit.enchantments.Enchantment;
import org.jetbrains.annotations.ApiStatus.Internal;
import org.jspecify.annotations.NullMarked;

/**
* An {@link Provider EnchantData.Provider} for
* {@link io.papermc.paper.datacomponent.DataComponentType DataComponent}-based {@link EnchantData}.
*/
@Internal
@NullMarked
class ComponentEnchantProvider implements Provider {
public class ComponentEnchantProvider implements Provider {

@Override
public EnchantData of(Enchantment enchantment) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
import org.bukkit.inventory.meta.Repairable;
import org.jspecify.annotations.NullMarked;

/**
* A {@link Temperer} for {@link ItemMeta}-based operations.
*/
@NullMarked
class MetaTemperer implements Temperer<MetaCachedStack> {
public class MetaTemperer implements Temperer<MetaCachedStack> {

static final MetaTemperer INSTANCE = new MetaTemperer();
public static final MetaTemperer INSTANCE = new MetaTemperer();

@Override
public boolean hasChanged(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
import org.bukkit.inventory.view.AnvilView;
import org.jspecify.annotations.NullMarked;

/**
* A {@link ViewState} wrapping contents with a {@link MetaCachedStack} for repeated meta
* modification.
*/
@NullMarked
class MetaViewState implements ViewState<MetaCachedStack> {
public class MetaViewState implements ViewState<MetaCachedStack> {

private final AnvilView view;
private final MetaCachedStack base;
private final MetaCachedStack addition;

MetaViewState(AnvilView view) {
public MetaViewState(AnvilView view) {
this.view = view;
this.base = new MetaCachedStack(view.getItem(0));
this.addition = new MetaCachedStack(view.getItem(1));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.bukkit.enchantments.Enchantment;
import org.jetbrains.annotations.ApiStatus.Internal;
import org.jspecify.annotations.NullMarked;

/**
* An {@link Provider EnchantData.Provider} using pre-baked enchantment data. May not include more
* recently added enchantments! Falls through to data for unbreaking.
*/
@Internal
@NullMarked
class MetaEnchantProvider implements Provider {
public class MetaEnchantProvider implements Provider {

private final Map<NamespacedKey, EnchantData> data = new HashMap<>();

Expand Down