mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Update

Browse Source
This commit is contained in:
BuildTools 2021-04-21 13:06:16 +08:00
parent 0a1345622e
commit 27bbca1502
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java
View File

@ -17,12 +17,15 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import java.util.Arrays;
import java.util.List;
/**
* This is a super class of the {@link AutoEnchanter} and {@link AutoDisenchanter} which is
* used to streamline some methods and combine common attributes to reduce redundancy.
*
*
* @author TheBusyBiscuit
*
*
* @see AutoEnchanter
* @see AutoDisenchanter
*
@ -31,6 +34,8 @@ abstract class AbstractEnchantmentMachine extends AContainer {
private final ItemSetting<Boolean> useLevelLimit = new ItemSetting<>(this, "use-enchant-level-limit", false);
private final IntRangeSetting levelLimit = new IntRangeSetting(this, "enchant-level-limit", 0, 10, Short.MAX_VALUE);
private final ItemSetting<List<String>> ignoredEnchantLores = new ItemSetting<>(this, "ignored-enchant-lores", Arrays.asList("&7- &cCan't be Auto-Enchanted"));
private final ItemSetting<List<String>> ignoredDisenchantLores = new ItemSetting<>(this, "ignored-disenchant-lores", Arrays.asList("&7- &cCan't be Auto-Disenchanted"));
@ParametersAreNonnullByDefault
protected AbstractEnchantmentMachine(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
@ -38,6 +43,8 @@ abstract class AbstractEnchantmentMachine extends AContainer {
addItemSetting(useLevelLimit);
addItemSetting(levelLimit);
addItemSetting(ignoredEnchantLores);
addItemSetting(ignoredDisenchantLores);
}
protected boolean isEnchantmentLevelAllowed(int enchantmentLevel) {
@ -55,4 +62,23 @@ abstract class AbstractEnchantmentMachine extends AContainer {
menu.replaceExistingItem(22, progressBar);
}
protected boolean hasIgnoredLore(ItemStack itemStack, AbstractEnchantmentMachine enchantmentMachine) {
List<String> ignoredLores = null;
if (enchantmentMachine instanceof AutoEnchanter) {
ignoredLores = ignoredEnchantLores.getValue();
} else if (enchantmentMachine instanceof AutoDisenchanter) {
ignoredLores = ignoredDisenchantLores.getValue();
}
if (itemStack.hasItemMeta()) {
List<String> lores = itemStack.getItemMeta().getLore();
if (lores != null && ignoredLores != null) {
for (String lore : ignoredLores) {
if (lores.contains(ChatColors.color(lore))) {
return true;
}
}
}
}
return false;
}
}

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java
View File

@ -142,6 +142,8 @@ public class AutoDisenchanter extends AbstractEnchantmentMachine {
private boolean isDisenchantable(@Nullable ItemStack item) {
if (item == null) {
return false;
} else if (hasIgnoredLore(item, this)) {
return false;
} else if (item.getType() != Material.BOOK) {
// ^ This stops endless checks of getByItem for books
SlimefunItem sfItem = SlimefunItem.getByItem(item);

8
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java
View File

@ -120,8 +120,12 @@ public class AutoEnchanter extends AbstractEnchantmentMachine {
}
private boolean isEnchantable(@Nullable ItemStack item) {
// stops endless checks of getByItem for enchanted book stacks.
if (item != null && item.getType() != Material.ENCHANTED_BOOK) {
if (item == null) {
return false;
} else if (hasIgnoredLore(item, this)) {
return false;
} else if (item.getType() != Material.ENCHANTED_BOOK) {
// stops endless checks of getByItem for enchanted book stacks.
SlimefunItem sfItem = SlimefunItem.getByItem(item);
return sfItem == null || sfItem.isEnchantable();
} else {