alexcrea/CustomAnvil
1
0
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-06-23 16:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

alpha version up & cleanup code.

Browse source
This commit is contained in:
alexcrea 2024-03-31 00:59:50 +01:00
parent 1b83c8db81
commit 00fba2f4b0
40 changed files with 893 additions and 718 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -4,7 +4,7 @@ plugins {
} }
group = "xyz.alexcrea" group = "xyz.alexcrea"
version = "1.3.2-A1" version = "1.3.2-A2"
repositories { repositories {
mavenCentral() mavenCentral()

80
src/main/java/xyz/alexcrea/cuanvil/config/ConfigHolder.java
View file

@ -19,27 +19,27 @@ public abstract class ConfigHolder {
public static ConflictConfigHolder CONFLICT_HOLDER; public static ConflictConfigHolder CONFLICT_HOLDER;
public static UnitRepairHolder UNIT_REPAIR_HOLDER; public static UnitRepairHolder UNIT_REPAIR_HOLDER;
public static boolean loadConfig(){ public static boolean loadConfig() {
DEFAULT_CONFIG = new DefaultConfigHolder(); DEFAULT_CONFIG = new DefaultConfigHolder();
ITEM_GROUP_HOLDER = new ItemGroupConfigHolder(); ITEM_GROUP_HOLDER = new ItemGroupConfigHolder();
CONFLICT_HOLDER = new ConflictConfigHolder(); CONFLICT_HOLDER = new ConflictConfigHolder();
UNIT_REPAIR_HOLDER = new UnitRepairHolder(); UNIT_REPAIR_HOLDER = new UnitRepairHolder();
boolean result = reloadAllFromDisk(true); boolean result = reloadAllFromDisk(true);
if(result){ if (result) {
MetricsUtil.INSTANCE.testIfConfigIsDefault(); MetricsUtil.INSTANCE.testIfConfigIsDefault();
} }
return result; return result;
} }
public static boolean reloadAllFromDisk(boolean hardfail){ public static boolean reloadAllFromDisk(boolean hardfail) {
boolean sucess = DEFAULT_CONFIG.reloadFromDisk(hardfail); boolean sucess = DEFAULT_CONFIG.reloadFromDisk(hardfail);
if(!sucess) return false; if (!sucess) return false;
sucess = ITEM_GROUP_HOLDER.reloadFromDisk(hardfail); sucess = ITEM_GROUP_HOLDER.reloadFromDisk(hardfail);
if(!sucess) return false; if (!sucess) return false;
sucess = CONFLICT_HOLDER.reloadFromDisk(hardfail); sucess = CONFLICT_HOLDER.reloadFromDisk(hardfail);
if(!sucess) return false; if (!sucess) return false;
sucess = UNIT_REPAIR_HOLDER.reloadFromDisk(hardfail); sucess = UNIT_REPAIR_HOLDER.reloadFromDisk(hardfail);
return sucess; return sucess;
} }
@ -49,43 +49,49 @@ public abstract class ConfigHolder {
private static final File BACKUP_FOLDER = new File(CustomAnvil.instance.getDataFolder(), "backup"); private static final File BACKUP_FOLDER = new File(CustomAnvil.instance.getDataFolder(), "backup");
protected FileConfiguration configuration; protected FileConfiguration configuration;
protected ConfigHolder(){
protected ConfigHolder() {
} }
public abstract boolean reloadFromDisk(boolean hardFail); public abstract boolean reloadFromDisk(boolean hardFail);
public abstract void reload(); public abstract void reload();
public FileConfiguration getConfig(){
public FileConfiguration getConfig() {
return configuration; return configuration;
} }
// Config name and files // Config name and files
protected abstract String getConfigFileName(); protected abstract String getConfigFileName();
protected String getConfigFileExtension(){ protected String getConfigFileExtension() {
return ".yml"; return ".yml";
} }
protected File getConfigFile(){
return new File(CustomAnvil.instance.getDataFolder(), getConfigFileName()+getConfigFileExtension()); protected File getConfigFile() {
return new File(CustomAnvil.instance.getDataFolder(), getConfigFileName() + getConfigFileExtension());
} }
protected File getFirstBackup(){
return new File(BACKUP_FOLDER, getConfigFileName()+"-first"+getConfigFileExtension()); protected File getFirstBackup() {
return new File(BACKUP_FOLDER, getConfigFileName() + "-first" + getConfigFileExtension());
} }
protected File getLastBackup(){
return new File(BACKUP_FOLDER, getConfigFileName()+"-latest"+getConfigFileExtension()); protected File getLastBackup() {
return new File(BACKUP_FOLDER, getConfigFileName() + "-latest" + getConfigFileExtension());
} }
// Save logic // Save logic
public boolean saveToDisk(boolean doBackup){ public boolean saveToDisk(boolean doBackup) {
if(doBackup){ if (doBackup) {
if(!saveBackup()){ if (!saveBackup()) {
CustomAnvil.instance.getLogger().severe("Could not save backup. see above."); CustomAnvil.instance.getLogger().severe("Could not save backup. see above.");
return false; return false;
} }
} }
File base = getConfigFile(); File base = getConfigFile();
// if file exist and can't be deleted the file, then we gave up. // if file exist and can't be deleted the file, then we gave up.
if(base.exists() && !base.delete()) { if (base.exists() && !base.delete()) {
CustomAnvil.instance.getLogger().severe("Could not save config: can't delete existing file."); CustomAnvil.instance.getLogger().severe("Could not save config: can't delete existing file.");
return false; return false;
} }
@ -101,15 +107,15 @@ public abstract class ConfigHolder {
return true; return true;
} }
protected boolean saveBackup(){ protected boolean saveBackup() {
File base = getConfigFile(); File base = getConfigFile();
if(!base.exists()) return true; // We did back up everything we had to (nothing in this case) if (!base.exists()) return true; // We did back up everything we had to (nothing in this case)
boolean sufficientSuccess = false; boolean sufficientSuccess = false;
BACKUP_FOLDER.mkdirs(); BACKUP_FOLDER.mkdirs();
// save first backup if do not exist // save first backup if do not exist
File firstBackup = getFirstBackup(); File firstBackup = getFirstBackup();
if(!firstBackup.exists()){ if (!firstBackup.exists()) {
try { try {
Files.copy(base, firstBackup); Files.copy(base, firstBackup);
sufficientSuccess = true; sufficientSuccess = true;
@ -120,7 +126,7 @@ public abstract class ConfigHolder {
// save last backup // save last backup
File lastBackup = getLastBackup(); File lastBackup = getLastBackup();
// if file exist and can't be deleted the file, then we gave up. // if file exist and can't be deleted the file, then we gave up.
if(lastBackup.exists() && !lastBackup.delete()){ if (lastBackup.exists() && !lastBackup.delete()) {
return sufficientSuccess; return sufficientSuccess;
} }
@ -134,7 +140,7 @@ public abstract class ConfigHolder {
return sufficientSuccess; return sufficientSuccess;
} }
public static class DefaultConfigHolder extends ConfigHolder{ public static class DefaultConfigHolder extends ConfigHolder {
@Override @Override
protected String getConfigFileName() { protected String getConfigFileName() {
@ -150,15 +156,17 @@ public abstract class ConfigHolder {
} }
@Override @Override
public void reload() {}// Nothing to do public void reload() {
}// Nothing to do
} }
// Abstract class for non default config // Abstract class for non default config
public abstract static class ResourceConfigHolder extends ConfigHolder{ public abstract static class ResourceConfigHolder extends ConfigHolder {
String resourceName; String resourceName;
private ResourceConfigHolder(String resourceName){
private ResourceConfigHolder(String resourceName) {
this.resourceName = resourceName; this.resourceName = resourceName;
} }
@ -170,8 +178,8 @@ public abstract class ConfigHolder {
@Override @Override
public boolean reloadFromDisk(boolean hardFail) { public boolean reloadFromDisk(boolean hardFail) {
YamlConfiguration configuration = CustomAnvil.instance.reloadResource( YamlConfiguration configuration = CustomAnvil.instance.reloadResource(
getConfigFileName()+getConfigFileExtension(), hardFail); getConfigFileName() + getConfigFileExtension(), hardFail);
if(configuration == null) return false; if (configuration == null) return false;
this.configuration = configuration; this.configuration = configuration;
reload(); reload();
return true; return true;
@ -180,10 +188,11 @@ public abstract class ConfigHolder {
} }
// Class for itemGroupsManager config // Class for itemGroupsManager config
public static class ItemGroupConfigHolder extends ResourceConfigHolder{ public static class ItemGroupConfigHolder extends ResourceConfigHolder {
private final static String FILE_NAME = "item_groups"; private final static String FILE_NAME = "item_groups";
ItemGroupManager itemGroupsManager; ItemGroupManager itemGroupsManager;
private ItemGroupConfigHolder() { private ItemGroupConfigHolder() {
super(FILE_NAME); super(FILE_NAME);
} }
@ -198,7 +207,7 @@ public abstract class ConfigHolder {
this.itemGroupsManager = new ItemGroupManager(); this.itemGroupsManager = new ItemGroupManager();
this.itemGroupsManager.prepareGroups(this.configuration); this.itemGroupsManager.prepareGroups(this.configuration);
if(CONFLICT_HOLDER.getConfig() != null){ if (CONFLICT_HOLDER.getConfig() != null) {
CONFLICT_HOLDER.reload(); CONFLICT_HOLDER.reload();
} }
} }
@ -206,10 +215,11 @@ public abstract class ConfigHolder {
} }
// Class for enchant conflict config // Class for enchant conflict config
public static class ConflictConfigHolder extends ResourceConfigHolder{ public static class ConflictConfigHolder extends ResourceConfigHolder {
private final static String FILE_NAME = "enchant_conflict"; private final static String FILE_NAME = "enchant_conflict";
EnchantConflictManager conflictManager; EnchantConflictManager conflictManager;
private ConflictConfigHolder() { private ConflictConfigHolder() {
super(FILE_NAME); super(FILE_NAME);
} }
@ -229,14 +239,16 @@ public abstract class ConfigHolder {
} }
// Class for unit repair config // Class for unit repair config
public static class UnitRepairHolder extends ResourceConfigHolder{ public static class UnitRepairHolder extends ResourceConfigHolder {
private final static String ITEM_GROUP_FILE_NAME = "unit_repair_item"; private final static String ITEM_GROUP_FILE_NAME = "unit_repair_item";
private UnitRepairHolder() { private UnitRepairHolder() {
super(ITEM_GROUP_FILE_NAME); super(ITEM_GROUP_FILE_NAME);
} }
@Override @Override
public void reload() {} // Do nothing public void reload() {
} // Do nothing
} }

7
src/main/java/xyz/alexcrea/cuanvil/enchant/EnchantmentProperties.java
View file

@ -41,12 +41,11 @@ public enum EnchantmentProperties {
SWEEPING(EnchantmentRarity.RARE), SWEEPING(EnchantmentRarity.RARE),
THORNS(EnchantmentRarity.VERY_RARE), THORNS(EnchantmentRarity.VERY_RARE),
UNBREAKING(EnchantmentRarity.UNCOMMON), UNBREAKING(EnchantmentRarity.UNCOMMON),
VANISHING_CURSE(EnchantmentRarity.VERY_RARE) VANISHING_CURSE(EnchantmentRarity.VERY_RARE);
;
private final EnchantmentRarity rarity; private final EnchantmentRarity rarity;
EnchantmentProperties(EnchantmentRarity rarity){
EnchantmentProperties(EnchantmentRarity rarity) {
this.rarity = rarity; this.rarity = rarity;
} }

11
src/main/java/xyz/alexcrea/cuanvil/enchant/EnchantmentRarity.java
View file

@ -7,19 +7,18 @@ public enum EnchantmentRarity {
COMMON(1), COMMON(1),
UNCOMMON(2), UNCOMMON(2),
RARE(4), RARE(4),
VERY_RARE(8) VERY_RARE(8);
;
private final int itemValue; private final int itemValue;
private final int bookValue; private final int bookValue;
EnchantmentRarity(int itemValue, int bookValue){ EnchantmentRarity(int itemValue, int bookValue) {
this.itemValue = itemValue; this.itemValue = itemValue;
this.bookValue = bookValue; this.bookValue = bookValue;
} }
EnchantmentRarity(int itemValue){
this(itemValue, Math.max(1,itemValue/2)); EnchantmentRarity(int itemValue) {
this(itemValue, Math.max(1, itemValue / 2));
} }
public int getBookValue() { public int getBookValue() {

8
src/main/java/xyz/alexcrea/cuanvil/gui/config/AbstractEnchantConfigGui.java
View file

@ -14,15 +14,17 @@ import java.util.List;
/** /**
* Abstract Global Config gui for enchantment setting configuration. * Abstract Global Config gui for enchantment setting configuration.
*
* @param <T> Type of the factory of the type of setting the gui should edit. * @param <T> Type of the factory of the type of setting the gui should edit.
*/ */
public abstract class AbstractEnchantConfigGui<T extends AbstractSettingGui.SettingGuiFactory> extends ValueUpdatableGui { public abstract class AbstractEnchantConfigGui<T extends AbstractSettingGui.SettingGuiFactory> extends ValueUpdatableGui {
/** /**
* Constructor for a gui displaying available enchantment to edit a enchantment setting. * Constructor for a gui displaying available enchantment to edit a enchantment setting.
*
* @param title Title of the gui. * @param title Title of the gui.
*/ */
protected AbstractEnchantConfigGui(String title){ protected AbstractEnchantConfigGui(String title) {
super(6, title, CustomAnvil.instance); super(6, title, CustomAnvil.instance);
} }
@ -31,7 +33,7 @@ public abstract class AbstractEnchantConfigGui<T extends AbstractSettingGui.Sett
/** /**
* Initialise value updatable gui pattern * Initialise value updatable gui pattern
*/ */
protected void init(){ protected void init() {
// Back item panel // Back item panel
addPane(GuiSharedConstant.BACK_TO_MAIN_MENU_BIG_LIST_DISPLAY_BACKGROUND_PANE); addPane(GuiSharedConstant.BACK_TO_MAIN_MENU_BIG_LIST_DISPLAY_BACKGROUND_PANE);
@ -50,7 +52,7 @@ public abstract class AbstractEnchantConfigGui<T extends AbstractSettingGui.Sett
/** /**
* Prepare enchantment config gui displayed items factory. * Prepare enchantment config gui displayed items factory.
*/ */
protected void prepareValues(){ protected void prepareValues() {
bookItemFactoryList = new ArrayList<>(); bookItemFactoryList = new ArrayList<>();
for (Enchantment enchant : GuiSharedConstant.SORTED_ENCHANTMENT_LIST) { for (Enchantment enchant : GuiSharedConstant.SORTED_ENCHANTMENT_LIST) {

9
src/main/java/xyz/alexcrea/cuanvil/gui/config/ConfirmActionGui.java
View file

@ -24,6 +24,7 @@ public class ConfirmActionGui extends ChestGui {
private static final ItemStack CANCEL_ITEM; private static final ItemStack CANCEL_ITEM;
private static final ItemStack CONFIRM_ITEM; private static final ItemStack CONFIRM_ITEM;
static { static {
CANCEL_ITEM = new ItemStack(Material.RED_TERRACOTTA); CANCEL_ITEM = new ItemStack(Material.RED_TERRACOTTA);
ItemMeta meta = CANCEL_ITEM.getItemMeta(); ItemMeta meta = CANCEL_ITEM.getItemMeta();
@ -58,21 +59,21 @@ public class ConfirmActionGui extends ChestGui {
event.setCancelled(true); event.setCancelled(true);
HumanEntity player = event.getWhoClicked(); HumanEntity player = event.getWhoClicked();
if(!player.hasPermission(CustomAnvil.editConfigPermission)) { if (!player.hasPermission(CustomAnvil.editConfigPermission)) {
player.closeInventory(); player.closeInventory();
player.sendMessage(GuiGlobalActions.NO_EDIT_PERM); player.sendMessage(GuiGlobalActions.NO_EDIT_PERM);
return; return;
} }
boolean success; boolean success;
try{ try {
success = onConfirm.get(); success = onConfirm.get();
}catch (Exception e){ } catch (Exception e) {
CustomAnvil.instance.getLogger().log(Level.WARNING, "Could not process confirmation supplier.", e); CustomAnvil.instance.getLogger().log(Level.WARNING, "Could not process confirmation supplier.", e);
success = false; success = false;
} }
if(!success){ if (!success) {
event.getWhoClicked().sendMessage("\u00A7cAction could not be completed. "); event.getWhoClicked().sendMessage("\u00A7cAction could not be completed. ");
} }
backOnConfirm.show(player); backOnConfirm.show(player);

24
src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java
View file

@ -33,7 +33,7 @@ public class BasicConfigGui extends ValueUpdatableGui {
/** /**
* Constructor of this Global gui for basic settings. * Constructor of this Global gui for basic settings.
*/ */
private BasicConfigGui(){ private BasicConfigGui() {
super(3, "\u00A78Basic Config", CustomAnvil.instance); super(3, "\u00A78Basic Config", CustomAnvil.instance);
} }
@ -42,7 +42,7 @@ public class BasicConfigGui extends ValueUpdatableGui {
/** /**
* Initialise Basic gui * Initialise Basic gui
*/ */
private void init(){ private void init() {
Pattern pattern = new Pattern( Pattern pattern = new Pattern(
GuiSharedConstant.EMPTY_GUI_FULL_LINE, GuiSharedConstant.EMPTY_GUI_FULL_LINE,
"012345670", "012345670",
@ -70,15 +70,15 @@ public class BasicConfigGui extends ValueUpdatableGui {
/** /**
* Prepare basic gui displayed items factory and static items.. * Prepare basic gui displayed items factory and static items..
*/ */
protected void prepareValues(){ protected void prepareValues() {
// limit repair item // limit repair item
this.limitRepairFactory = BoolSettingsGui.boolFactory("\u00A78Limit Repair Cost ?",this, this.limitRepairFactory = BoolSettingsGui.boolFactory("\u00A78Limit Repair Cost ?", this,
ConfigOptions.LIMIT_REPAIR_COST, ConfigHolder.DEFAULT_CONFIG, ConfigOptions.DEFAULT_LIMIT_REPAIR); ConfigOptions.LIMIT_REPAIR_COST, ConfigHolder.DEFAULT_CONFIG, ConfigOptions.DEFAULT_LIMIT_REPAIR);
// rename cost item // rename cost item
IntRange range = ConfigOptions.REPAIR_LIMIT_RANGE; IntRange range = ConfigOptions.REPAIR_LIMIT_RANGE;
this.repairCostFactory = IntSettingsGui.intFactory("\u00A78Repair Cost Limit", this, this.repairCostFactory = IntSettingsGui.intFactory("\u00A78Repair Cost Limit", this,
ConfigOptions.LIMIT_REPAIR_VALUE, ConfigHolder.DEFAULT_CONFIG, range.getFirst(),range.getLast(), ConfigOptions.LIMIT_REPAIR_VALUE, ConfigHolder.DEFAULT_CONFIG, range.getFirst(), range.getLast(),
ConfigOptions.DEFAULT_LIMIT_REPAIR_VALUE, ConfigOptions.DEFAULT_LIMIT_REPAIR_VALUE,
1, 5, 10); 1, 5, 10);
@ -92,33 +92,33 @@ public class BasicConfigGui extends ValueUpdatableGui {
this.notNeededLimitValueItem = new GuiItem(item, GuiGlobalActions.stayInPlace, CustomAnvil.instance); this.notNeededLimitValueItem = new GuiItem(item, GuiGlobalActions.stayInPlace, CustomAnvil.instance);
// remove repair limit item // remove repair limit item
this.removeRepairLimit = BoolSettingsGui.boolFactory("\u00A78Remove Repair Limit ?",this, this.removeRepairLimit = BoolSettingsGui.boolFactory("\u00A78Remove Repair Limit ?", this,
ConfigOptions.REMOVE_REPAIR_LIMIT, ConfigHolder.DEFAULT_CONFIG, ConfigOptions.DEFAULT_REMOVE_LIMIT); ConfigOptions.REMOVE_REPAIR_LIMIT, ConfigHolder.DEFAULT_CONFIG, ConfigOptions.DEFAULT_REMOVE_LIMIT);
// item repair cost // item repair cost
range = ConfigOptions.REPAIR_COST_RANGE; range = ConfigOptions.REPAIR_COST_RANGE;
this.itemRepairCost = IntSettingsGui.intFactory("\u00A78Item Repair Cost", this, this.itemRepairCost = IntSettingsGui.intFactory("\u00A78Item Repair Cost", this,
ConfigOptions.ITEM_REPAIR_COST, ConfigHolder.DEFAULT_CONFIG, range.getFirst(),range.getLast(), ConfigOptions.ITEM_REPAIR_COST, ConfigHolder.DEFAULT_CONFIG, range.getFirst(), range.getLast(),
ConfigOptions.DEFAULT_ITEM_REPAIR_COST, ConfigOptions.DEFAULT_ITEM_REPAIR_COST,
1, 5, 10, 50, 100); 1, 5, 10, 50, 100);
// unit repair cost // unit repair cost
this.unitRepairCost = IntSettingsGui.intFactory("\u00A78Unit Repair Cost", this, this.unitRepairCost = IntSettingsGui.intFactory("\u00A78Unit Repair Cost", this,
ConfigOptions.UNIT_REPAIR_COST, ConfigHolder.DEFAULT_CONFIG, range.getFirst(),range.getLast(), ConfigOptions.UNIT_REPAIR_COST, ConfigHolder.DEFAULT_CONFIG, range.getFirst(), range.getLast(),
ConfigOptions.DEFAULT_UNIT_REPAIR_COST, ConfigOptions.DEFAULT_UNIT_REPAIR_COST,
1, 5, 10, 50, 100); 1, 5, 10, 50, 100);
// item rename cost // item rename cost
range = ConfigOptions.ITEM_RENAME_COST_RANGE; range = ConfigOptions.ITEM_RENAME_COST_RANGE;
this.itemRenameCost = IntSettingsGui.intFactory("\u00A78Rename Cost", this, this.itemRenameCost = IntSettingsGui.intFactory("\u00A78Rename Cost", this,
ConfigOptions.ITEM_RENAME_COST, ConfigHolder.DEFAULT_CONFIG, range.getFirst(),range.getLast(), ConfigOptions.ITEM_RENAME_COST, ConfigHolder.DEFAULT_CONFIG, range.getFirst(), range.getLast(),
ConfigOptions.DEFAULT_ITEM_RENAME_COST, ConfigOptions.DEFAULT_ITEM_RENAME_COST,
1, 5, 10, 50, 100); 1, 5, 10, 50, 100);
// sacrifice illegal enchant cost // sacrifice illegal enchant cost
range = ConfigOptions.SACRIFICE_ILLEGAL_COST_RANGE; range = ConfigOptions.SACRIFICE_ILLEGAL_COST_RANGE;
this.sacrificeIllegalEnchantCost = IntSettingsGui.intFactory("\u00A78Sacrifice Illegal Enchant Cost", this, this.sacrificeIllegalEnchantCost = IntSettingsGui.intFactory("\u00A78Sacrifice Illegal Enchant Cost", this,
ConfigOptions.SACRIFICE_ILLEGAL_COST, ConfigHolder.DEFAULT_CONFIG, range.getFirst(),range.getLast(), ConfigOptions.SACRIFICE_ILLEGAL_COST, ConfigHolder.DEFAULT_CONFIG, range.getFirst(), range.getLast(),
ConfigOptions.DEFAULT_SACRIFICE_ILLEGAL_COST, ConfigOptions.DEFAULT_SACRIFICE_ILLEGAL_COST,
1, 5, 10, 50, 100); 1, 5, 10, 50, 100);
@ -132,9 +132,9 @@ public class BasicConfigGui extends ValueUpdatableGui {
// rename cost item // rename cost item
GuiItem limitRepairValueItem; GuiItem limitRepairValueItem;
if(this.limitRepairFactory.getConfiguredValue()){ if (this.limitRepairFactory.getConfiguredValue()) {
limitRepairValueItem = GuiGlobalItems.intSettingGuiItem(this.repairCostFactory, Material.EXPERIENCE_BOTTLE); limitRepairValueItem = GuiGlobalItems.intSettingGuiItem(this.repairCostFactory, Material.EXPERIENCE_BOTTLE);
}else{ } else {
limitRepairValueItem = this.notNeededLimitValueItem; limitRepairValueItem = this.notNeededLimitValueItem;
} }
pane.bindItem('2', limitRepairValueItem); pane.bindItem('2', limitRepairValueItem);

94
src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantConflictGui.java
View file

@ -31,6 +31,7 @@ import java.util.function.Consumer;
public class EnchantConflictGui extends ChestGui { public class EnchantConflictGui extends ChestGui {
public final static EnchantConflictGui INSTANCE = new EnchantConflictGui(); public final static EnchantConflictGui INSTANCE = new EnchantConflictGui();
static { static {
INSTANCE.init(); INSTANCE.init();
} }
@ -47,7 +48,7 @@ public class EnchantConflictGui extends ChestGui {
private HashMap<UUID, Integer> pageMap; private HashMap<UUID, Integer> pageMap;
private PatternPane backgroundPane; private PatternPane backgroundPane;
private void init(){ private void init() {
// Back item panel // Back item panel
Pattern pattern = new Pattern( Pattern pattern = new Pattern(
GuiSharedConstant.EMPTY_GUI_FULL_LINE, GuiSharedConstant.EMPTY_GUI_FULL_LINE,
@ -80,13 +81,14 @@ public class EnchantConflictGui extends ChestGui {
private GuiItem goLeftItem; private GuiItem goLeftItem;
private GuiItem goRightItem; private GuiItem goRightItem;
private void prepareOtherValues() { private void prepareOtherValues() {
// Left item creation for consumer & bind // Left item creation for consumer & bind
this.goLeftItem = new GuiItem(new ItemStack(Material.RED_TERRACOTTA), event -> { this.goLeftItem = new GuiItem(new ItemStack(Material.RED_TERRACOTTA), event -> {
HumanEntity viewer = event.getWhoClicked(); HumanEntity viewer = event.getWhoClicked();
UUID playerUUID = viewer.getUniqueId(); UUID playerUUID = viewer.getUniqueId();
int page = this.pageMap.getOrDefault(playerUUID, 0); int page = this.pageMap.getOrDefault(playerUUID, 0);
this.pageMap.put(playerUUID, page-1); this.pageMap.put(playerUUID, page - 1);
ItemStack cursor = viewer.getItemOnCursor(); ItemStack cursor = viewer.getItemOnCursor();
viewer.setItemOnCursor(new ItemStack(Material.AIR)); viewer.setItemOnCursor(new ItemStack(Material.AIR));
@ -101,7 +103,7 @@ public class EnchantConflictGui extends ChestGui {
HumanEntity viewer = event.getWhoClicked(); HumanEntity viewer = event.getWhoClicked();
UUID playerUUID = viewer.getUniqueId(); UUID playerUUID = viewer.getUniqueId();
int page = pageMap.getOrDefault(playerUUID, 0); int page = pageMap.getOrDefault(playerUUID, 0);
this.pageMap.put(playerUUID, page+1); this.pageMap.put(playerUUID, page + 1);
ItemStack cursor = viewer.getItemOnCursor(); ItemStack cursor = viewer.getItemOnCursor();
viewer.setItemOnCursor(new ItemStack(Material.AIR)); viewer.setItemOnCursor(new ItemStack(Material.AIR));
@ -124,12 +126,12 @@ public class EnchantConflictGui extends ChestGui {
createItem.setItemMeta(createMeta); createItem.setItemMeta(createMeta);
this.backgroundPane.bindItem('C', new GuiItem(createItem, (clickEvent)->{ this.backgroundPane.bindItem('C', new GuiItem(createItem, (clickEvent) -> {
clickEvent.setCancelled(true); clickEvent.setCancelled(true);
HumanEntity player = clickEvent.getWhoClicked(); HumanEntity player = clickEvent.getWhoClicked();
// check permission // check permission
if(!player.hasPermission(CustomAnvil.editConfigPermission)) { if (!player.hasPermission(CustomAnvil.editConfigPermission)) {
player.closeInventory(); player.closeInventory();
player.sendMessage(GuiGlobalActions.NO_EDIT_PERM); player.sendMessage(GuiGlobalActions.NO_EDIT_PERM);
return; return;
@ -147,10 +149,10 @@ public class EnchantConflictGui extends ChestGui {
private Consumer<String> prepareCreateItemConsumer(HumanEntity player) { private Consumer<String> prepareCreateItemConsumer(HumanEntity player) {
AtomicReference<Consumer<String>> selfRef = new AtomicReference<>(); AtomicReference<Consumer<String>> selfRef = new AtomicReference<>();
Consumer<String> selfCallback = (message) -> { Consumer<String> selfCallback = (message) -> {
if(message == null) return; if (message == null) return;
message = message.toLowerCase(Locale.ROOT); message = message.toLowerCase(Locale.ROOT);
if("cancel".equalsIgnoreCase(message)) { if ("cancel".equalsIgnoreCase(message)) {
player.sendMessage("conflict creation cancelled..."); player.sendMessage("conflict creation cancelled...");
show(player); show(player);
return; return;
@ -161,7 +163,7 @@ public class EnchantConflictGui extends ChestGui {
// Try to find if it already exists in a for loop // Try to find if it already exists in a for loop
// Not the most efficient on large number of conflict, but it should not run often. // Not the most efficient on large number of conflict, but it should not run often.
for (EnchantConflictGroup conflict : ConfigHolder.CONFLICT_HOLDER.getConflictManager().getConflictList()) { for (EnchantConflictGroup conflict : ConfigHolder.CONFLICT_HOLDER.getConflictManager().getConflictList()) {
if(conflict.getName().equalsIgnoreCase(message)){ if (conflict.getName().equalsIgnoreCase(message)) {
player.sendMessage("\u00A7cPlease enter a conflict name that do not already exist..."); player.sendMessage("\u00A7cPlease enter a conflict name that do not already exist...");
// wait next message. // wait next message.
CustomAnvil.Companion.getChatListener().setListenedCallback(player, selfRef.get()); CustomAnvil.Companion.getChatListener().setListenedCallback(player, selfRef.get());
@ -182,11 +184,11 @@ public class EnchantConflictGui extends ChestGui {
String[] emptyStringArray = new String[0]; String[] emptyStringArray = new String[0];
FileConfiguration config = ConfigHolder.CONFLICT_HOLDER.getConfig(); FileConfiguration config = ConfigHolder.CONFLICT_HOLDER.getConfig();
config.set(message+".enchantments", emptyStringArray); config.set(message + ".enchantments", emptyStringArray);
config.set(message+".notAffectedGroups", emptyStringArray); config.set(message + ".notAffectedGroups", emptyStringArray);
config.set(message+".maxEnchantmentBeforeConflict", 0); config.set(message + ".maxEnchantmentBeforeConflict", 0);
if(GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE){ if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) {
ConfigHolder.CONFLICT_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE); ConfigHolder.CONFLICT_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE);
} }
@ -199,7 +201,7 @@ public class EnchantConflictGui extends ChestGui {
return selfCallback; return selfCallback;
} }
private OutlinePane createEmptyPage(){ private OutlinePane createEmptyPage() {
OutlinePane page = new OutlinePane(0, 0, 9, 5); OutlinePane page = new OutlinePane(0, 0, 9, 5);
page.align(OutlinePane.Alignment.BEGIN); page.align(OutlinePane.Alignment.BEGIN);
page.setOrientation(Orientable.Orientation.HORIZONTAL); page.setOrientation(Orientable.Orientation.HORIZONTAL);
@ -207,7 +209,7 @@ public class EnchantConflictGui extends ChestGui {
return page; return page;
} }
public void reloadValues(){ public void reloadValues() {
this.conflictGuiMap.forEach((conflict, gui) -> gui.cleanUnused()); this.conflictGuiMap.forEach((conflict, gui) -> gui.cleanUnused());
this.conflictGuiMap.clear(); this.conflictGuiMap.clear();
this.firstPage.clear(); this.firstPage.clear();
@ -221,28 +223,28 @@ public class EnchantConflictGui extends ChestGui {
update(); update();
} }
public static ItemStack createItemForConflict(EnchantConflictGroup conflict){ public static ItemStack createItemForConflict(EnchantConflictGroup conflict) {
ItemStack item = new ItemStack(conflict.getRepresentativeMaterial()); ItemStack item = new ItemStack(conflict.getRepresentativeMaterial());
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName("\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(conflict.getName()) + " \u00A7fConflict"); meta.setDisplayName("\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(conflict.getName()) + " \u00A7fConflict");
meta.setLore(Arrays.asList( meta.setLore(Arrays.asList(
"\u00A77Enchantment count: \u00A7e"+conflict.getEnchants().size(), "\u00A77Enchantment count: \u00A7e" + conflict.getEnchants().size(),
"\u00A77Group count: \u00A7e"+conflict.getCantConflictGroup().getGroups().size(), "\u00A77Group count: \u00A7e" + conflict.getCantConflictGroup().getGroups().size(),
"\u00A77Min enchantments count: \u00A7e"+conflict.getMinBeforeBlock() "\u00A77Min enchantments count: \u00A7e" + conflict.getMinBeforeBlock()
)); ));
item.setItemMeta(meta); item.setItemMeta(meta);
return item; return item;
} }
public void updateValueForConflict(EnchantConflictGroup conflict, boolean shouldUpdate){ public void updateValueForConflict(EnchantConflictGroup conflict, boolean shouldUpdate) {
EnchantConflictSubSettingGui gui = this.conflictGuiMap.get(conflict); EnchantConflictSubSettingGui gui = this.conflictGuiMap.get(conflict);
ItemStack item = createItemForConflict(conflict); ItemStack item = createItemForConflict(conflict);
GuiItem guiItem; GuiItem guiItem;
if(gui == null){ if (gui == null) {
// Create new sub setting gui // Create new sub setting gui
guiItem = new GuiItem(item, CustomAnvil.instance); guiItem = new GuiItem(item, CustomAnvil.instance);
gui = new EnchantConflictSubSettingGui(this, conflict, guiItem); gui = new EnchantConflictSubSettingGui(this, conflict, guiItem);
@ -251,22 +253,22 @@ public class EnchantConflictGui extends ChestGui {
this.conflictGuiMap.put(conflict, gui); this.conflictGuiMap.put(conflict, gui);
addToPage(guiItem); addToPage(guiItem);
}else{ } else {
// Replace item with the updated one // Replace item with the updated one
guiItem = gui.getParentItemForThisGui(); guiItem = gui.getParentItemForThisGui();
guiItem.setItem(item); guiItem.setItem(item);
} }
gui.updateLocal(); gui.updateLocal();
if(shouldUpdate){ if (shouldUpdate) {
update(); update();
} }
} }
public void removeConflict(EnchantConflictGroup conflict){ public void removeConflict(EnchantConflictGroup conflict) {
EnchantConflictSubSettingGui gui = this.conflictGuiMap.get(conflict); EnchantConflictSubSettingGui gui = this.conflictGuiMap.get(conflict);
if(gui == null) return; if (gui == null) return;
this.conflictGuiMap.remove(conflict); this.conflictGuiMap.remove(conflict);
removeFromPage(gui.getParentItemForThisGui()); removeFromPage(gui.getParentItemForThisGui());
@ -276,8 +278,8 @@ public class EnchantConflictGui extends ChestGui {
private void addToPage(GuiItem guiItem) { private void addToPage(GuiItem guiItem) {
// Get first available page or create one // Get first available page or create one
OutlinePane page = this.pages.get(this.pages.size()-1); OutlinePane page = this.pages.get(this.pages.size() - 1);
if(page.getItems().size() >= 5*9){ if (page.getItems().size() >= 5 * 9) {
page = createEmptyPage(); page = createEmptyPage();
this.pages.add(page); this.pages.add(page);
} }
@ -289,16 +291,16 @@ public class EnchantConflictGui extends ChestGui {
// get item page // get item page
OutlinePane page = null; OutlinePane page = null;
int pageID = 0; int pageID = 0;
while(pageID < this.pages.size()){ while (pageID < this.pages.size()) {
OutlinePane tempPage = this.pages.get(pageID); OutlinePane tempPage = this.pages.get(pageID);
if(tempPage.getItems().contains(guiItem)){ if (tempPage.getItems().contains(guiItem)) {
page = tempPage; page = tempPage;
break; break;
} }
pageID++; pageID++;
} }
if(page == null){// Why... if (page == null) {// Why...
return; return;
} }
removeFromPage(page, pageID, guiItem); removeFromPage(page, pageID, guiItem);
@ -308,62 +310,62 @@ public class EnchantConflictGui extends ChestGui {
page.removeItem(guiItem); page.removeItem(guiItem);
// There is now a slot available, let fill it if possible // There is now a slot available, let fill it if possible
if(pageID < (this.pages.size() - 1)){ if (pageID < (this.pages.size() - 1)) {
OutlinePane newPage = this.pages.get(pageID+1); OutlinePane newPage = this.pages.get(pageID + 1);
GuiItem nextPageItem = newPage.getItems().get(0); GuiItem nextPageItem = newPage.getItems().get(0);
removeFromPage(newPage, pageID+1, nextPageItem); removeFromPage(newPage, pageID + 1, nextPageItem);
OutlinePane thisPage = this.pages.get(pageID); OutlinePane thisPage = this.pages.get(pageID);
thisPage.addItem(nextPageItem); thisPage.addItem(nextPageItem);
}else if(pageID > 0 && page.getItems().isEmpty()){ } else if (pageID > 0 && page.getItems().isEmpty()) {
this.pages.remove(pageID); this.pages.remove(pageID);
} }
} }
public int getPlayerPageID(UUID uuid){ public int getPlayerPageID(UUID uuid) {
int pageId = this.pageMap.getOrDefault(uuid, 0); int pageId = this.pageMap.getOrDefault(uuid, 0);
if(pageId >= this.pages.size()){ if (pageId >= this.pages.size()) {
pageId = this.pages.size()-1; pageId = this.pages.size() - 1;
} }
return pageId; return pageId;
} }
public void placeArrow(int page, boolean customise){ public void placeArrow(int page, boolean customise) {
// Place left arrow // Place left arrow
addPane(this.backgroundPane); addPane(this.backgroundPane);
if(page > 0){ if (page > 0) {
if(customise){ if (customise) {
ItemStack leftItem = this.goLeftItem.getItem(); ItemStack leftItem = this.goLeftItem.getItem();
ItemMeta leftMeta = leftItem.getItemMeta(); ItemMeta leftMeta = leftItem.getItemMeta();
leftMeta.setDisplayName("\u00A7eReturn to page " +(page)); leftMeta.setDisplayName("\u00A7eReturn to page " + (page));
leftItem.setItemMeta(leftMeta); leftItem.setItemMeta(leftMeta);
this.goLeftItem.setItem(leftItem); this.goLeftItem.setItem(leftItem);
} }
this.backgroundPane.bindItem('L', this.goLeftItem); this.backgroundPane.bindItem('L', this.goLeftItem);
}else{ } else {
this.backgroundPane.bindItem('L', GuiSharedConstant.SECONDARY_BACKGROUND_ITEM); this.backgroundPane.bindItem('L', GuiSharedConstant.SECONDARY_BACKGROUND_ITEM);
} }
// Place right arrow // Place right arrow
if(page < pages.size()-1){ if (page < pages.size() - 1) {
if(customise){ if (customise) {
ItemStack rightItem = this.goRightItem.getItem(); ItemStack rightItem = this.goRightItem.getItem();
ItemMeta rightMeta = rightItem.getItemMeta(); ItemMeta rightMeta = rightItem.getItemMeta();
rightMeta.setDisplayName("\u00A7eGo to page " +(page+2)); rightMeta.setDisplayName("\u00A7eGo to page " + (page + 2));
rightItem.setItemMeta(rightMeta); rightItem.setItemMeta(rightMeta);
this.goRightItem.setItem(rightItem); this.goRightItem.setItem(rightItem);
} }
this.backgroundPane.bindItem('R', this.goRightItem); this.backgroundPane.bindItem('R', this.goRightItem);
}else{ } else {
this.backgroundPane.bindItem('R', GuiSharedConstant.SECONDARY_BACKGROUND_ITEM); this.backgroundPane.bindItem('R', GuiSharedConstant.SECONDARY_BACKGROUND_ITEM);
} }
} }
@ -381,7 +383,7 @@ public class EnchantConflictGui extends ChestGui {
addPane(page); addPane(page);
// set title // set title
setTitle("Conflict Config ("+(pageID+1)+"/"+(pages.size())+")"); setTitle("Conflict Config (" + (pageID + 1) + "/" + (pages.size()) + ")");
super.show(humanEntity); super.show(humanEntity);

7
src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantCostConfigGui.java
View file

@ -46,10 +46,11 @@ public class EnchantCostConfigGui extends AbstractEnchantConfigGui<EnchantCostSe
EnchantmentRarity rarity = EnchantmentRarity.NO_RARITY; EnchantmentRarity rarity = EnchantmentRarity.NO_RARITY;
try { try {
rarity = EnchantmentProperties.valueOf(key.toUpperCase(Locale.ENGLISH)).getRarity(); rarity = EnchantmentProperties.valueOf(key.toUpperCase(Locale.ENGLISH)).getRarity();
}catch (IllegalArgumentException ignored){} } catch (IllegalArgumentException ignored) {
}
return EnchantCostSettingsGui.enchantCostFactory(prettyKey+" Level Cost", this, return EnchantCostSettingsGui.enchantCostFactory(prettyKey + " Level Cost", this,
SECTION_NAME+'.'+key, ConfigHolder.DEFAULT_CONFIG, 0, 255, SECTION_NAME + '.' + key, ConfigHolder.DEFAULT_CONFIG, 0, 255,
rarity.getItemValue(), rarity.getBookValue(), rarity.getItemValue(), rarity.getBookValue(),
1, 10, 50); 1, 10, 50);
} }

4
src/main/java/xyz/alexcrea/cuanvil/gui/config/global/EnchantLimitConfigGui.java
View file

@ -37,8 +37,8 @@ public class EnchantLimitConfigGui extends AbstractEnchantConfigGui<IntSettingsG
String key = enchant.getKey().getKey().toLowerCase(Locale.ROOT); String key = enchant.getKey().getKey().toLowerCase(Locale.ROOT);
String prettyKey = CasedStringUtil.snakeToUpperSpacedCase(key); String prettyKey = CasedStringUtil.snakeToUpperSpacedCase(key);
return IntSettingsGui.intFactory(prettyKey+" Level Limit", this, return IntSettingsGui.intFactory(prettyKey + " Level Limit", this,
SECTION_NAME+'.'+key, ConfigHolder.DEFAULT_CONFIG, 0, 255, SECTION_NAME + '.' + key, ConfigHolder.DEFAULT_CONFIG, 0, 255,
enchant.getMaxLevel(), enchant.getMaxLevel(),
1, 5, 10, 50, 100); 1, 5, 10, 50, 100);
} }

5
src/main/java/xyz/alexcrea/cuanvil/gui/config/global/MainConfigGui.java
View file

@ -20,12 +20,13 @@ public class MainConfigGui extends ChestGui {
static { static {
INSTANCE.init(); INSTANCE.init();
} }
private MainConfigGui() { private MainConfigGui() {
super(3, "\u00A78Anvil Config", CustomAnvil.instance); super(3, "\u00A78Anvil Config", CustomAnvil.instance);
} }
private void init(){ private void init() {
Pattern pattern = new Pattern( Pattern pattern = new Pattern(
"I00000000", "I00000000",
"012304560", "012304560",
@ -101,7 +102,7 @@ public class MainConfigGui extends ChestGui {
GuiItem quitItem = new GuiItem(quitItemstack, event -> { GuiItem quitItem = new GuiItem(quitItemstack, event -> {
event.setCancelled(true); event.setCancelled(true);
event.getWhoClicked().closeInventory(); event.getWhoClicked().closeInventory();
},CustomAnvil.instance); }, CustomAnvil.instance);
pane.bindItem('Q', quitItem); pane.bindItem('Q', quitItem);
// create & bind "info" item // create & bind "info" item

15
src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/AbstractSettingGui.java
View file

@ -26,6 +26,7 @@ public abstract class AbstractSettingGui extends ChestGui {
/** /**
* Prepare necessary object for a setting gui. * Prepare necessary object for a setting gui.
*
* @param rows Number of row for this gui. * @param rows Number of row for this gui.
* @param title Title of this gui. * @param title Title of this gui.
* @param parent Parent gui to go back when completed. * @param parent Parent gui to go back when completed.
@ -37,6 +38,7 @@ public abstract class AbstractSettingGui extends ChestGui {
/** /**
* Prepare necessary object for a setting gui. * Prepare necessary object for a setting gui.
*
* @param rows Number of row for this gui. * @param rows Number of row for this gui.
* @param title Title of this gui. * @param title Title of this gui.
* @param parent Parent gui to go back when completed. * @param parent Parent gui to go back when completed.
@ -50,9 +52,10 @@ public abstract class AbstractSettingGui extends ChestGui {
/** /**
* Initialise and prepare value for this gui. * Initialise and prepare value for this gui.
*
* @param parent Parent gui to go back when completed. * @param parent Parent gui to go back when completed.
*/ */
private void initBase(ValueUpdatableGui parent){ private void initBase(ValueUpdatableGui parent) {
Pattern pattern = getGuiPattern(); Pattern pattern = getGuiPattern();
pane = new PatternPane(0, 0, pattern.getLength(), pattern.getHeight(), pattern); pane = new PatternPane(0, 0, pattern.getLength(), pattern.getHeight(), pattern);
addPane(pane); addPane(pane);
@ -75,6 +78,7 @@ public abstract class AbstractSettingGui extends ChestGui {
/** /**
* Get main pane for this setting gui. * Get main pane for this setting gui.
*
* @return Main pattern pain of this gui. * @return Main pattern pain of this gui.
*/ */
protected PatternPane getPane() { protected PatternPane getPane() {
@ -89,12 +93,14 @@ public abstract class AbstractSettingGui extends ChestGui {
* <li><b>B</b>: "back to previous gui" button.</li> * <li><b>B</b>: "back to previous gui" button.</li>
* <li><b>0</b>: default background item.</li> * <li><b>0</b>: default background item.</li>
* </ul> * </ul>
*
* @return The gui's pattern. * @return The gui's pattern.
*/ */
protected abstract Pattern getGuiPattern(); protected abstract Pattern getGuiPattern();
/** /**
* Called when the associated setting need to be saved. * Called when the associated setting need to be saved.
*
* @return true if the save was successful. false otherwise * @return true if the save was successful. false otherwise
*/ */
public abstract boolean onSave(); public abstract boolean onSave();
@ -102,6 +108,7 @@ public abstract class AbstractSettingGui extends ChestGui {
/** /**
* If this function return true * If this function return true
* the gui assume the associated setting can be saved. * the gui assume the associated setting can be saved.
*
* @return true if there is a change to the setting. false otherwise * @return true if there is a change to the setting. false otherwise
*/ */
public abstract boolean hadChange(); public abstract boolean hadChange();
@ -111,16 +118,17 @@ public abstract class AbstractSettingGui extends ChestGui {
* <p> * <p>
* It is better to keep a factory that hold setting data than find what parameters to use every time. * It is better to keep a factory that hold setting data than find what parameters to use every time.
*/ */
public abstract static class SettingGuiFactory{ public abstract static class SettingGuiFactory {
protected String configPath; protected String configPath;
protected ConfigHolder config; protected ConfigHolder config;
/** /**
* Constructor for settings gui factory * Constructor for settings gui factory
*
* @param configPath Configuration path of this setting. * @param configPath Configuration path of this setting.
* @param config Configuration holder of this setting. * @param config Configuration holder of this setting.
*/ */
protected SettingGuiFactory(String configPath, ConfigHolder config){ protected SettingGuiFactory(String configPath, ConfigHolder config) {
this.configPath = configPath; this.configPath = configPath;
this.config = config; this.config = config;
} }
@ -141,6 +149,7 @@ public abstract class AbstractSettingGui extends ChestGui {
/** /**
* Create a gui using setting parameters and current setting value. * Create a gui using setting parameters and current setting value.
*
* @return A new instance of the implemented setting gui. * @return A new instance of the implemented setting gui.
*/ */
public abstract AbstractSettingGui create(); public abstract AbstractSettingGui create();

39
src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/BoolSettingsGui.java
View file

@ -21,7 +21,7 @@ import java.util.function.Consumer;
/** /**
* An instance of a gui used to edit a boolean setting. * An instance of a gui used to edit a boolean setting.
*/ */
public class BoolSettingsGui extends AbstractSettingGui{ public class BoolSettingsGui extends AbstractSettingGui {
private final BoolSettingFactory holder; private final BoolSettingFactory holder;
private final boolean before; private final boolean before;
@ -29,6 +29,7 @@ public class BoolSettingsGui extends AbstractSettingGui{
/** /**
* Create a boolean setting config gui. * Create a boolean setting config gui.
*
* @param holder Configuration factory of this setting. * @param holder Configuration factory of this setting.
* @param now The defined value of this setting. * @param now The defined value of this setting.
*/ */
@ -57,12 +58,12 @@ public class BoolSettingsGui extends AbstractSettingGui{
/** /**
* Prepare "return to default value" gui item. * Prepare "return to default value" gui item.
*/ */
protected void prepareReturnToDefault(){ protected void prepareReturnToDefault() {
ItemStack item = new ItemStack(Material.COMMAND_BLOCK); ItemStack item = new ItemStack(Material.COMMAND_BLOCK);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName("\u00A7eReset to default value"); meta.setDisplayName("\u00A7eReset to default value");
meta.setLore(Collections.singletonList("\u00A77Default value is: "+holder.defaultVal)); meta.setLore(Collections.singletonList("\u00A77Default value is: " + holder.defaultVal));
item.setItemMeta(meta); item.setItemMeta(meta);
returnToDefault = new GuiItem(item, event -> { returnToDefault = new GuiItem(item, event -> {
event.setCancelled(true); event.setCancelled(true);
@ -75,16 +76,16 @@ public class BoolSettingsGui extends AbstractSettingGui{
/** /**
* Update item using the setting value to match the new value * Update item using the setting value to match the new value
*/ */
protected void updateValueDisplay(){ protected void updateValueDisplay() {
PatternPane pane = getPane(); PatternPane pane = getPane();
// Get displayed value for this config. // Get displayed value for this config.
String displayedName; String displayedName;
Material displayedMat; Material displayedMat;
if(now){ if (now) {
displayedName = "\u00A7aTrue"; displayedName = "\u00A7aTrue";
displayedMat = Material.GREEN_TERRACOTTA; displayedMat = Material.GREEN_TERRACOTTA;
}else{ } else {
displayedName = "\u00A7cFalse"; displayedName = "\u00A7cFalse";
displayedMat = Material.RED_TERRACOTTA; displayedMat = Material.RED_TERRACOTTA;
} }
@ -100,9 +101,9 @@ public class BoolSettingsGui extends AbstractSettingGui{
// reset to default // reset to default
GuiItem returnToDefault; GuiItem returnToDefault;
if(now != holder.defaultVal){ if (now != holder.defaultVal) {
returnToDefault = this.returnToDefault; returnToDefault = this.returnToDefault;
}else{ } else {
returnToDefault = GuiGlobalItems.backgroundItem(); returnToDefault = GuiGlobalItems.backgroundItem();
} }
pane.bindItem('D', returnToDefault); pane.bindItem('D', returnToDefault);
@ -112,8 +113,8 @@ public class BoolSettingsGui extends AbstractSettingGui{
/** /**
* @return A consumer to update the current setting's value. * @return A consumer to update the current setting's value.
*/ */
protected Consumer<InventoryClickEvent> inverseNowConsumer(){ protected Consumer<InventoryClickEvent> inverseNowConsumer() {
return event->{ return event -> {
event.setCancelled(true); event.setCancelled(true);
now = !now; now = !now;
updateValueDisplay(); updateValueDisplay();
@ -126,7 +127,7 @@ public class BoolSettingsGui extends AbstractSettingGui{
holder.config.getConfig().set(holder.configPath, now); holder.config.getConfig().set(holder.configPath, now);
MetricsUtil.INSTANCE.notifyChange(this.holder.config, this.holder.configPath); MetricsUtil.INSTANCE.notifyChange(this.holder.config, this.holder.configPath);
if(GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE){ if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) {
return holder.config.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE); return holder.config.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE);
} }
return true; return true;
@ -139,6 +140,7 @@ public class BoolSettingsGui extends AbstractSettingGui{
/** /**
* Create a bool setting factory from setting's parameters. * Create a bool setting factory from setting's parameters.
*
* @param title The title of the gui. * @param title The title of the gui.
* @param parent Parent gui to go back when completed. * @param parent Parent gui to go back when completed.
* @param configPath Configuration path of this setting. * @param configPath Configuration path of this setting.
@ -148,9 +150,9 @@ public class BoolSettingsGui extends AbstractSettingGui{
*/ */
public static BoolSettingFactory boolFactory(@NotNull String title, ValueUpdatableGui parent, public static BoolSettingFactory boolFactory(@NotNull String title, ValueUpdatableGui parent,
String configPath, ConfigHolder config, String configPath, ConfigHolder config,
boolean defaultVal){ boolean defaultVal) {
return new BoolSettingFactory( return new BoolSettingFactory(
title,parent, title, parent,
configPath, config, configPath, config,
defaultVal); defaultVal);
} }
@ -158,12 +160,15 @@ public class BoolSettingsGui extends AbstractSettingGui{
/** /**
* A factory for a boolean setting gui that hold setting's information. * A factory for a boolean setting gui that hold setting's information.
*/ */
public static class BoolSettingFactory extends SettingGuiFactory{ public static class BoolSettingFactory extends SettingGuiFactory {
@NotNull String title; ValueUpdatableGui parent; @NotNull
String title;
ValueUpdatableGui parent;
boolean defaultVal; boolean defaultVal;
/** /**
* Constructor for a boolean setting gui factory. * Constructor for a boolean setting gui factory.
*
* @param title The title of the gui. * @param title The title of the gui.
* @param parent Parent gui to go back when completed. * @param parent Parent gui to go back when completed.
* @param configPath Configuration path of this setting. * @param configPath Configuration path of this setting.
@ -173,7 +178,7 @@ public class BoolSettingsGui extends AbstractSettingGui{
protected BoolSettingFactory( protected BoolSettingFactory(
@NotNull String title, ValueUpdatableGui parent, @NotNull String title, ValueUpdatableGui parent,
String configPath, ConfigHolder config, String configPath, ConfigHolder config,
boolean defaultVal){ boolean defaultVal) {
super(configPath, config); super(configPath, config);
this.title = title; this.title = title;
this.parent = parent; this.parent = parent;
@ -192,7 +197,7 @@ public class BoolSettingsGui extends AbstractSettingGui{
/** /**
* @return The configured value for the associated setting. * @return The configured value for the associated setting.
*/ */
public boolean getConfiguredValue(){ public boolean getConfiguredValue() {
return this.config.getConfig().getBoolean(this.configPath, this.defaultVal); return this.config.getConfig().getBoolean(this.configPath, this.defaultVal);
} }

54
src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantCostSettingsGui.java
View file

@ -34,6 +34,7 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
/** /**
* Create an enchantment cost setting config gui. * Create an enchantment cost setting config gui.
*
* @param holder Configuration factory of this setting. * @param holder Configuration factory of this setting.
* @param nowItem The defined value of this setting item's value. * @param nowItem The defined value of this setting item's value.
*/ */
@ -54,7 +55,7 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
protected void initStepsValue() { protected void initStepsValue() {
super.initStepsValue(); super.initStepsValue();
int nowBook = ((EnchantCostSettingFactory)this.holder).getConfiguredBookValue(); int nowBook = ((EnchantCostSettingFactory) this.holder).getConfiguredBookValue();
this.beforeBook = nowBook; this.beforeBook = nowBook;
this.nowBook = nowBook; this.nowBook = nowBook;
} }
@ -81,7 +82,8 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
bookMeta.setDisplayName("\u00A7aCost of an Enchantment by Book"); bookMeta.setDisplayName("\u00A7aCost of an Enchantment by Book");
bookMeta.setLore(Arrays.asList( bookMeta.setLore(Arrays.asList(
"\u00A77Cost per result item level of an sacrifice enchantment", "\u00A77Cost per result item level of an sacrifice enchantment",
"\u00A77Only apply if sacrificed item \u00A7cis \u00A77a book"));bookItemstack.setItemMeta(bookMeta); "\u00A77Only apply if sacrificed item \u00A7cis \u00A77a book"));
bookItemstack.setItemMeta(bookMeta);
// sword display // sword display
ItemStack swordItemstack = new ItemStack(Material.WOODEN_SWORD); ItemStack swordItemstack = new ItemStack(Material.WOODEN_SWORD);
@ -100,7 +102,7 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
} }
@Override @Override
protected void prepareReturnToDefault(){ protected void prepareReturnToDefault() {
ItemStack item = new ItemStack(Material.COMMAND_BLOCK); ItemStack item = new ItemStack(Material.COMMAND_BLOCK);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
@ -122,7 +124,7 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
} }
@Override @Override
protected void updateValueDisplay(){ protected void updateValueDisplay() {
super.updateValueDisplay(); super.updateValueDisplay();
PatternPane pane = getPane(); PatternPane pane = getPane();
@ -133,32 +135,32 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
// minus item // minus item
GuiItem minusItem; GuiItem minusItem;
if(nowBook > holder.min){ if (nowBook > holder.min) {
int planned = Math.max(holder.min, nowBook - step); int planned = Math.max(holder.min, nowBook - step);
ItemStack item = new ItemStack(Material.RED_TERRACOTTA); ItemStack item = new ItemStack(Material.RED_TERRACOTTA);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName("\u00A7e"+nowBook+" -> "+planned + " \u00A7r(\u00A7c-"+(nowBook-planned)+"\u00A7r)"); meta.setDisplayName("\u00A7e" + nowBook + " -> " + planned + " \u00A7r(\u00A7c-" + (nowBook - planned) + "\u00A7r)");
meta.setLore(AbstractSettingGui.CLICK_LORE); meta.setLore(AbstractSettingGui.CLICK_LORE);
item.setItemMeta(meta); item.setItemMeta(meta);
minusItem = new GuiItem(item, updateNowBookConsumer(planned), CustomAnvil.instance); minusItem = new GuiItem(item, updateNowBookConsumer(planned), CustomAnvil.instance);
}else{ } else {
minusItem = GuiGlobalItems.backgroundItem(Material.BARRIER); minusItem = GuiGlobalItems.backgroundItem(Material.BARRIER);
} }
pane.bindItem('M', minusItem); pane.bindItem('M', minusItem);
//plus item //plus item
GuiItem plusItem; GuiItem plusItem;
if(nowBook < holder.max){ if (nowBook < holder.max) {
int planned = Math.min(holder.max, nowBook + step); int planned = Math.min(holder.max, nowBook + step);
ItemStack item = new ItemStack(Material.GREEN_TERRACOTTA); ItemStack item = new ItemStack(Material.GREEN_TERRACOTTA);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName("\u00A7e"+nowBook+" -> "+planned + " \u00A7r(\u00A7a+"+(planned-nowBook)+"\u00A7r)"); meta.setDisplayName("\u00A7e" + nowBook + " -> " + planned + " \u00A7r(\u00A7a+" + (planned - nowBook) + "\u00A7r)");
meta.setLore(AbstractSettingGui.CLICK_LORE); meta.setLore(AbstractSettingGui.CLICK_LORE);
item.setItemMeta(meta); item.setItemMeta(meta);
plusItem = new GuiItem(item, updateNowBookConsumer(planned), CustomAnvil.instance); plusItem = new GuiItem(item, updateNowBookConsumer(planned), CustomAnvil.instance);
}else{ } else {
plusItem = GuiGlobalItems.backgroundItem(Material.BARRIER); plusItem = GuiGlobalItems.backgroundItem(Material.BARRIER);
} }
pane.bindItem('P', plusItem); pane.bindItem('P', plusItem);
@ -166,7 +168,7 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
// "result" display // "result" display
ItemStack resultPaper = new ItemStack(Material.PAPER); ItemStack resultPaper = new ItemStack(Material.PAPER);
ItemMeta resultMeta = resultPaper.getItemMeta(); ItemMeta resultMeta = resultPaper.getItemMeta();
resultMeta.setDisplayName("\u00A7eValue: "+nowBook); resultMeta.setDisplayName("\u00A7eValue: " + nowBook);
resultPaper.setItemMeta(resultMeta); resultPaper.setItemMeta(resultMeta);
GuiItem resultItem = new GuiItem(resultPaper, GuiGlobalActions.stayInPlace, CustomAnvil.instance); GuiItem resultItem = new GuiItem(resultPaper, GuiGlobalActions.stayInPlace, CustomAnvil.instance);
@ -174,9 +176,9 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
// reset to default // reset to default
GuiItem returnToDefault; GuiItem returnToDefault;
if(now != holder.defaultVal || nowBook != holder.defaultBookVal){ if (now != holder.defaultVal || nowBook != holder.defaultBookVal) {
returnToDefault = this.returnToDefault; returnToDefault = this.returnToDefault;
}else{ } else {
returnToDefault = GuiGlobalItems.backgroundItem(); returnToDefault = GuiGlobalItems.backgroundItem();
} }
pane.bindItem('D', returnToDefault); pane.bindItem('D', returnToDefault);
@ -188,8 +190,8 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
* @param planned Value to change current book cost setting to. * @param planned Value to change current book cost setting to.
* @return A consumer to update the current book cost setting's value. * @return A consumer to update the current book cost setting's value.
*/ */
protected Consumer<InventoryClickEvent> updateNowBookConsumer(int planned){ protected Consumer<InventoryClickEvent> updateNowBookConsumer(int planned) {
return event->{ return event -> {
event.setCancelled(true); event.setCancelled(true);
nowBook = planned; nowBook = planned;
updateValueDisplay(); updateValueDisplay();
@ -204,11 +206,11 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
@Override @Override
public boolean onSave() { public boolean onSave() {
holder.config.getConfig().set(holder.configPath+ITEM_PATH, now); holder.config.getConfig().set(holder.configPath + ITEM_PATH, now);
holder.config.getConfig().set(holder.configPath+BOOK_PATH, nowBook); holder.config.getConfig().set(holder.configPath + BOOK_PATH, nowBook);
MetricsUtil.INSTANCE.notifyChange(this.holder.config, this.holder.configPath); MetricsUtil.INSTANCE.notifyChange(this.holder.config, this.holder.configPath);
if(GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE){ if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) {
return holder.config.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE); return holder.config.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE);
} }
return true; return true;
@ -221,6 +223,7 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
/** /**
* Create an int setting factory from setting's parameters. * Create an int setting factory from setting's parameters.
*
* @param title The title of the gui. * @param title The title of the gui.
* @param parent Parent gui to go back when completed. * @param parent Parent gui to go back when completed.
* @param configPath Configuration path of this setting. * @param configPath Configuration path of this setting.
@ -239,9 +242,9 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
@NotNull String title, ValueUpdatableGui parent, @NotNull String title, ValueUpdatableGui parent,
String configPath, ConfigHolder config, String configPath, ConfigHolder config,
int min, int max, int defaultItemVal, int defaultBookVal, int min, int max, int defaultItemVal, int defaultBookVal,
int... steps){ int... steps) {
return new EnchantCostSettingFactory( return new EnchantCostSettingFactory(
title,parent, title, parent,
configPath, config, configPath, config,
min, max, defaultItemVal, defaultBookVal, steps); min, max, defaultItemVal, defaultBookVal, steps);
} }
@ -255,6 +258,7 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
/** /**
* Constructor for an enchantment cost setting gui factory. * Constructor for an enchantment cost setting gui factory.
*
* @param title The title of the gui. * @param title The title of the gui.
* @param parent Parent gui to go back when completed. * @param parent Parent gui to go back when completed.
* @param configPath Configuration path of this setting. * @param configPath Configuration path of this setting.
@ -272,9 +276,9 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
@NotNull String title, ValueUpdatableGui parent, @NotNull String title, ValueUpdatableGui parent,
String configPath, ConfigHolder config, String configPath, ConfigHolder config,
int min, int max, int defaultItemVal, int defaultBookVal, int min, int max, int defaultItemVal, int defaultBookVal,
int... steps){ int... steps) {
super(title,parent, super(title, parent,
configPath, config, configPath, config,
min, max, defaultItemVal, steps); min, max, defaultItemVal, steps);
this.defaultBookVal = defaultBookVal; this.defaultBookVal = defaultBookVal;
@ -285,14 +289,14 @@ public class EnchantCostSettingsGui extends IntSettingsGui {
*/ */
@Override @Override
public int getConfiguredValue() { public int getConfiguredValue() {
return this.config.getConfig().getInt(this.configPath+ITEM_PATH, this.defaultVal); return this.config.getConfig().getInt(this.configPath + ITEM_PATH, this.defaultVal);
} }
/** /**
* @return The configured value for the enchant setting book value. * @return The configured value for the enchant setting book value.
*/ */
public int getConfiguredBookValue(){ public int getConfiguredBookValue() {
return this.config.getConfig().getInt(this.configPath+BOOK_PATH, this.defaultBookVal); return this.config.getConfig().getInt(this.configPath + BOOK_PATH, this.defaultBookVal);
} }
@Override @Override

32
src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java
View file

@ -24,7 +24,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
public class EnchantSelectSettingGui extends AbstractSettingGui{ public class EnchantSelectSettingGui extends AbstractSettingGui {
SelectEnchantmentContainer enchantContainer; SelectEnchantmentContainer enchantContainer;
int page; int page;
@ -57,7 +57,7 @@ public class EnchantSelectSettingGui extends AbstractSettingGui{
); );
} }
protected void initGroups(){ protected void initGroups() {
// Add enchantment gui item // Add enchantment gui item
OutlinePane filledEnchant = new OutlinePane(0, 0, 9, 5); OutlinePane filledEnchant = new OutlinePane(0, 0, 9, 5);
filledEnchant.setPriority(Pane.Priority.HIGH); filledEnchant.setPriority(Pane.Priority.HIGH);
@ -66,7 +66,7 @@ public class EnchantSelectSettingGui extends AbstractSettingGui{
Set<Enchantment> illegalEnchant = this.enchantContainer.illegalEnchantments(); Set<Enchantment> illegalEnchant = this.enchantContainer.illegalEnchantments();
for (Enchantment enchant : GuiSharedConstant.SORTED_ENCHANTMENT_LIST) { for (Enchantment enchant : GuiSharedConstant.SORTED_ENCHANTMENT_LIST) {
if(illegalEnchant.contains(enchant)) { if (illegalEnchant.contains(enchant)) {
return; return;
} }
filledEnchant.addItem(getGuiItemFromEnchant(enchant)); filledEnchant.addItem(getGuiItemFromEnchant(enchant));
@ -76,13 +76,13 @@ public class EnchantSelectSettingGui extends AbstractSettingGui{
} }
private GuiItem getGuiItemFromEnchant(Enchantment enchantment){ private GuiItem getGuiItemFromEnchant(Enchantment enchantment) {
boolean isIn = this.selectedEnchant.contains(enchantment); boolean isIn = this.selectedEnchant.contains(enchantment);
Material usedMaterial; Material usedMaterial;
if(isIn){ if (isIn) {
usedMaterial = Material.ENCHANTED_BOOK; usedMaterial = Material.ENCHANTED_BOOK;
}else{ } else {
usedMaterial = Material.BOOK; usedMaterial = Material.BOOK;
} }
ItemStack item = new ItemStack(usedMaterial); ItemStack item = new ItemStack(usedMaterial);
@ -98,22 +98,22 @@ public class EnchantSelectSettingGui extends AbstractSettingGui{
private static final List<String> TRUE_LORE = Collections.singletonList("\u00A77Value: \u00A7aSelected"); private static final List<String> TRUE_LORE = Collections.singletonList("\u00A77Value: \u00A7aSelected");
private static final List<String> FALSE_LORE = Collections.singletonList("\u00A77Value: \u00A7cNot Selected"); private static final List<String> FALSE_LORE = Collections.singletonList("\u00A77Value: \u00A7cNot Selected");
public void setEnchantItemMeta(ItemStack item, String name, boolean isIn){ public void setEnchantItemMeta(ItemStack item, String name, boolean isIn) {
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
if(meta == null){ if (meta == null) {
CustomAnvil.instance.getLogger().warning("Could not create item for enchantment: "+name+":\n" + CustomAnvil.instance.getLogger().warning("Could not create item for enchantment: " + name + ":\n" +
"Item do not gave item meta: "+item+". Using placeholder instead"); "Item do not gave item meta: " + item + ". Using placeholder instead");
item.setType(Material.PAPER); item.setType(Material.PAPER);
meta = item.getItemMeta(); meta = item.getItemMeta();
assert meta != null; assert meta != null;
} }
meta.setDisplayName("\u00A7"+(isIn ? 'a' : 'c')+ CasedStringUtil.snakeToUpperSpacedCase(name)); meta.setDisplayName("\u00A7" + (isIn ? 'a' : 'c') + CasedStringUtil.snakeToUpperSpacedCase(name));
if(isIn){ if (isIn) {
meta.addEnchant(Enchantment.DAMAGE_UNDEAD, 1, true); meta.addEnchant(Enchantment.DAMAGE_UNDEAD, 1, true);
meta.setLore(TRUE_LORE); meta.setLore(TRUE_LORE);
}else{ } else {
meta.removeEnchant(Enchantment.DAMAGE_UNDEAD); meta.removeEnchant(Enchantment.DAMAGE_UNDEAD);
meta.setLore(FALSE_LORE); meta.setLore(FALSE_LORE);
} }
@ -122,17 +122,17 @@ public class EnchantSelectSettingGui extends AbstractSettingGui{
item.setItemMeta(meta); item.setItemMeta(meta);
} }
private Consumer<InventoryClickEvent> getEnchantItemConsumer(Enchantment enchant, GuiItem guiItem){ private Consumer<InventoryClickEvent> getEnchantItemConsumer(Enchantment enchant, GuiItem guiItem) {
return event -> { return event -> {
event.setCancelled(true); event.setCancelled(true);
ItemStack item = guiItem.getItem(); ItemStack item = guiItem.getItem();
boolean isIn = this.selectedEnchant.contains(enchant); boolean isIn = this.selectedEnchant.contains(enchant);
if(isIn){ if (isIn) {
this.selectedEnchant.remove(enchant); this.selectedEnchant.remove(enchant);
item.setType(Material.BOOK); item.setType(Material.BOOK);
}else{ } else {
this.selectedEnchant.add(enchant); this.selectedEnchant.add(enchant);
item.setType(Material.ENCHANTED_BOOK); item.setType(Material.ENCHANTED_BOOK);
} }

33
src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/GroupSelectSettingGui.java
View file

@ -20,10 +20,13 @@ import xyz.alexcrea.cuanvil.gui.config.SelectGroupContainer;
import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant;
import xyz.alexcrea.cuanvil.util.CasedStringUtil; import xyz.alexcrea.cuanvil.util.CasedStringUtil;
import java.util.*; import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
public class GroupSelectSettingGui extends AbstractSettingGui{ public class GroupSelectSettingGui extends AbstractSettingGui {
SelectGroupContainer groupContainer; SelectGroupContainer groupContainer;
int page; int page;
@ -56,7 +59,7 @@ public class GroupSelectSettingGui extends AbstractSettingGui{
); );
} }
protected void initGroups(){ protected void initGroups() {
// Add enchantment gui item // Add enchantment gui item
OutlinePane filledEnchant = new OutlinePane(0, 0, 9, 5); OutlinePane filledEnchant = new OutlinePane(0, 0, 9, 5);
filledEnchant.setPriority(Pane.Priority.HIGH); filledEnchant.setPriority(Pane.Priority.HIGH);
@ -65,7 +68,7 @@ public class GroupSelectSettingGui extends AbstractSettingGui{
Set<AbstractMaterialGroup> illegalGroup = this.groupContainer.illegalGroups(); Set<AbstractMaterialGroup> illegalGroup = this.groupContainer.illegalGroups();
for (AbstractMaterialGroup group : ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager().getGroupMap().values()) { for (AbstractMaterialGroup group : ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager().getGroupMap().values()) {
if(illegalGroup.contains(group)) { if (illegalGroup.contains(group)) {
return; return;
} }
filledEnchant.addItem(getGuiItemFromGroup(group)); filledEnchant.addItem(getGuiItemFromGroup(group));
@ -75,7 +78,7 @@ public class GroupSelectSettingGui extends AbstractSettingGui{
} }
private GuiItem getGuiItemFromGroup(AbstractMaterialGroup group){ private GuiItem getGuiItemFromGroup(AbstractMaterialGroup group) {
boolean isIn = this.selectedGroups.contains(group); boolean isIn = this.selectedGroups.contains(group);
Material usedMaterial = group.getRepresentativeMaterial(); Material usedMaterial = group.getRepresentativeMaterial();
@ -91,22 +94,22 @@ public class GroupSelectSettingGui extends AbstractSettingGui{
private static final List<String> TRUE_LORE = Collections.singletonList("\u00A77Value: \u00A7aSelected"); private static final List<String> TRUE_LORE = Collections.singletonList("\u00A77Value: \u00A7aSelected");
private static final List<String> FALSE_LORE = Collections.singletonList("\u00A77Value: \u00A7cNot Selected"); private static final List<String> FALSE_LORE = Collections.singletonList("\u00A77Value: \u00A7cNot Selected");
public void setGroupItemMeta(ItemStack item, String name, boolean isIn){ public void setGroupItemMeta(ItemStack item, String name, boolean isIn) {
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
if(meta == null){ if (meta == null) {
CustomAnvil.instance.getLogger().warning("Could not create item for group: "+name+":\n" + CustomAnvil.instance.getLogger().warning("Could not create item for group: " + name + ":\n" +
"Item do not gave item meta: "+item+". Using placeholder instead"); "Item do not gave item meta: " + item + ". Using placeholder instead");
item.setType(Material.PAPER); item.setType(Material.PAPER);
meta = item.getItemMeta(); meta = item.getItemMeta();
assert meta != null; assert meta != null;
} }
meta.setDisplayName("\u00A7"+(isIn ? 'a' : 'c')+ CasedStringUtil.snakeToUpperSpacedCase(name)); meta.setDisplayName("\u00A7" + (isIn ? 'a' : 'c') + CasedStringUtil.snakeToUpperSpacedCase(name));
if(isIn){ if (isIn) {
meta.addEnchant(Enchantment.DAMAGE_UNDEAD, 1, true); meta.addEnchant(Enchantment.DAMAGE_UNDEAD, 1, true);
meta.setLore(TRUE_LORE); meta.setLore(TRUE_LORE);
}else{ } else {
meta.removeEnchant(Enchantment.DAMAGE_UNDEAD); meta.removeEnchant(Enchantment.DAMAGE_UNDEAD);
meta.setLore(FALSE_LORE); meta.setLore(FALSE_LORE);
} }
@ -115,14 +118,14 @@ public class GroupSelectSettingGui extends AbstractSettingGui{
item.setItemMeta(meta); item.setItemMeta(meta);
} }
private Consumer<InventoryClickEvent> getGroupItemConsumer(AbstractMaterialGroup group, GuiItem guiItem){ private Consumer<InventoryClickEvent> getGroupItemConsumer(AbstractMaterialGroup group, GuiItem guiItem) {
return event -> { return event -> {
event.setCancelled(true); event.setCancelled(true);
boolean isIn = this.selectedGroups.contains(group); boolean isIn = this.selectedGroups.contains(group);
if(isIn){ if (isIn) {
this.selectedGroups.remove(group); this.selectedGroups.remove(group);
}else{ } else {
this.selectedGroups.add(group); this.selectedGroups.add(group);
} }

83
src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/IntSettingsGui.java
View file

@ -23,7 +23,7 @@ import java.util.function.Consumer;
/** /**
* An instance of a gui used to edit an int setting. * An instance of a gui used to edit an int setting.
*/ */
public class IntSettingsGui extends AbstractSettingGui{ public class IntSettingsGui extends AbstractSettingGui {
protected final IntSettingFactory holder; protected final IntSettingFactory holder;
protected final int before; protected final int before;
@ -32,6 +32,7 @@ public class IntSettingsGui extends AbstractSettingGui{
/** /**
* Create an int setting config gui. * Create an int setting config gui.
*
* @param holder Configuration factory of this setting. * @param holder Configuration factory of this setting.
* @param now The defined value of this setting. * @param now The defined value of this setting.
*/ */
@ -59,15 +60,16 @@ public class IntSettingsGui extends AbstractSettingGui{
} }
protected GuiItem returnToDefault; protected GuiItem returnToDefault;
/** /**
* Prepare "return to default value" gui item. * Prepare "return to default value" gui item.
*/ */
protected void prepareReturnToDefault(){ protected void prepareReturnToDefault() {
ItemStack item = new ItemStack(Material.COMMAND_BLOCK); ItemStack item = new ItemStack(Material.COMMAND_BLOCK);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName("\u00A7eReset to default value"); meta.setDisplayName("\u00A7eReset to default value");
meta.setLore(Collections.singletonList("\u00A77Default value is: "+holder.defaultVal)); meta.setLore(Collections.singletonList("\u00A77Default value is: " + holder.defaultVal));
item.setItemMeta(meta); item.setItemMeta(meta);
returnToDefault = new GuiItem(item, event -> { returnToDefault = new GuiItem(item, event -> {
event.setCancelled(true); event.setCancelled(true);
@ -80,22 +82,22 @@ public class IntSettingsGui extends AbstractSettingGui{
/** /**
* Update item using the setting value to match the new value. * Update item using the setting value to match the new value.
*/ */
protected void updateValueDisplay(){ protected void updateValueDisplay() {
PatternPane pane = getPane(); PatternPane pane = getPane();
// minus item // minus item
GuiItem minusItem; GuiItem minusItem;
if(now > holder.min){ if (now > holder.min) {
int planned = Math.max(holder.min, now - step); int planned = Math.max(holder.min, now - step);
ItemStack item = new ItemStack(Material.RED_TERRACOTTA); ItemStack item = new ItemStack(Material.RED_TERRACOTTA);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName("\u00A7e"+now+" -> "+planned + " \u00A7r(\u00A7c-"+(now-planned)+"\u00A7r)"); meta.setDisplayName("\u00A7e" + now + " -> " + planned + " \u00A7r(\u00A7c-" + (now - planned) + "\u00A7r)");
meta.setLore(AbstractSettingGui.CLICK_LORE); meta.setLore(AbstractSettingGui.CLICK_LORE);
item.setItemMeta(meta); item.setItemMeta(meta);
minusItem = new GuiItem(item, updateNowConsumer(planned), CustomAnvil.instance); minusItem = new GuiItem(item, updateNowConsumer(planned), CustomAnvil.instance);
}else{ } else {
minusItem = GuiGlobalItems.backgroundItem(Material.BARRIER); minusItem = GuiGlobalItems.backgroundItem(Material.BARRIER);
} }
pane.bindItem('-', minusItem); pane.bindItem('-', minusItem);
@ -103,16 +105,16 @@ public class IntSettingsGui extends AbstractSettingGui{
//plus item //plus item
// may do a function to generalise ? // may do a function to generalise ?
GuiItem plusItem; GuiItem plusItem;
if(now < holder.max){ if (now < holder.max) {
int planned = Math.min(holder.max, now + step); int planned = Math.min(holder.max, now + step);
ItemStack item = new ItemStack(Material.GREEN_TERRACOTTA); ItemStack item = new ItemStack(Material.GREEN_TERRACOTTA);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName("\u00A7e"+now+" -> "+planned + " \u00A7r(\u00A7a+"+(planned-now)+"\u00A7r)"); meta.setDisplayName("\u00A7e" + now + " -> " + planned + " \u00A7r(\u00A7a+" + (planned - now) + "\u00A7r)");
meta.setLore(AbstractSettingGui.CLICK_LORE); meta.setLore(AbstractSettingGui.CLICK_LORE);
item.setItemMeta(meta); item.setItemMeta(meta);
plusItem = new GuiItem(item, updateNowConsumer(planned), CustomAnvil.instance); plusItem = new GuiItem(item, updateNowConsumer(planned), CustomAnvil.instance);
}else{ } else {
plusItem = GuiGlobalItems.backgroundItem(Material.BARRIER); plusItem = GuiGlobalItems.backgroundItem(Material.BARRIER);
} }
pane.bindItem('+', plusItem); pane.bindItem('+', plusItem);
@ -120,7 +122,7 @@ public class IntSettingsGui extends AbstractSettingGui{
// "result" display // "result" display
ItemStack resultPaper = new ItemStack(Material.PAPER); ItemStack resultPaper = new ItemStack(Material.PAPER);
ItemMeta resultMeta = resultPaper.getItemMeta(); ItemMeta resultMeta = resultPaper.getItemMeta();
resultMeta.setDisplayName("\u00A7eValue: "+now); resultMeta.setDisplayName("\u00A7eValue: " + now);
resultPaper.setItemMeta(resultMeta); resultPaper.setItemMeta(resultMeta);
GuiItem resultItem = new GuiItem(resultPaper, GuiGlobalActions.stayInPlace, CustomAnvil.instance); GuiItem resultItem = new GuiItem(resultPaper, GuiGlobalActions.stayInPlace, CustomAnvil.instance);
@ -128,9 +130,9 @@ public class IntSettingsGui extends AbstractSettingGui{
// reset to default // reset to default
GuiItem returnToDefault; GuiItem returnToDefault;
if(now != holder.defaultVal){ if (now != holder.defaultVal) {
returnToDefault = this.returnToDefault; returnToDefault = this.returnToDefault;
}else{ } else {
returnToDefault = GuiGlobalItems.backgroundItem(); returnToDefault = GuiGlobalItems.backgroundItem();
} }
pane.bindItem('D', returnToDefault); pane.bindItem('D', returnToDefault);
@ -142,8 +144,8 @@ public class IntSettingsGui extends AbstractSettingGui{
* @param planned Value to change current setting to. * @param planned Value to change current setting to.
* @return A consumer to update the current setting's value. * @return A consumer to update the current setting's value.
*/ */
protected Consumer<InventoryClickEvent> updateNowConsumer(int planned){ protected Consumer<InventoryClickEvent> updateNowConsumer(int planned) {
return event->{ return event -> {
event.setCancelled(true); event.setCancelled(true);
now = planned; now = planned;
updateValueDisplay(); updateValueDisplay();
@ -154,12 +156,12 @@ public class IntSettingsGui extends AbstractSettingGui{
/** /**
* Initialise step items. * Initialise step items.
*/ */
protected void initStepsValue(){ protected void initStepsValue() {
// Put background glass on the background of 'a' to 'b' // Put background glass on the background of 'a' to 'b'
GuiItem background = GuiGlobalItems.backgroundItem(); GuiItem background = GuiGlobalItems.backgroundItem();
PatternPane pane = getPane(); PatternPane pane = getPane();
for (char i = 'a'; i < (getMidStepChar()-'a')*2+1; i++) { for (char i = 'a'; i < (getMidStepChar() - 'a') * 2 + 1; i++) {
pane.bindItem(i, background); pane.bindItem(i, background);
} }
// Then update legit step values // Then update legit step values
@ -169,35 +171,37 @@ public class IntSettingsGui extends AbstractSettingGui{
/** /**
* Update steps items value. * Update steps items value.
*/ */
protected void updateStepValue(){ protected void updateStepValue() {
if(holder.steps.length <= 1) return; if (holder.steps.length <= 1) return;
// We assume steps have a length of 2k+1 cause its more pretty // We assume steps have a length of 2k+1 cause its more pretty
char val = getMidStepChar(); char val = getMidStepChar();
// Offset to start (not the best way to do it) // Offset to start (not the best way to do it)
val -= (char) ((holder.steps.length-1)/2); val -= (char) ((holder.steps.length - 1) / 2);
// Then place items // Then place items
PatternPane pane = getPane(); PatternPane pane = getPane();
for (int i = 0; i < holder.steps.length; i++) { for (int i = 0; i < holder.steps.length; i++) {
pane.bindItem(val+i, stepGuiItem(i)); pane.bindItem(val + i, stepGuiItem(i));
} }
} }
/** /**
* Step use lower case character from 'a' to a certain char. * Step use lower case character from 'a' to a certain char.
*
* @return The middle value of the character set for steps. * @return The middle value of the character set for steps.
*/ */
protected char getMidStepChar(){ protected char getMidStepChar() {
return 'e'; return 'e';
} }
/** /**
* Create a step item from a step value. * Create a step item from a step value.
*
* @param stepIndex the index of the step item. * @param stepIndex the index of the step item.
* @return A step item corresponding to its index value. * @return A step item corresponding to its index value.
*/ */
protected GuiItem stepGuiItem(int stepIndex){ protected GuiItem stepGuiItem(int stepIndex) {
int stepValue = holder.steps[stepIndex]; int stepValue = holder.steps[stepIndex];
// Get material properties // Get material properties
@ -205,15 +209,15 @@ public class IntSettingsGui extends AbstractSettingGui{
StringBuilder stepName = new StringBuilder("\u00A7"); StringBuilder stepName = new StringBuilder("\u00A7");
List<String> stepLore; List<String> stepLore;
Consumer<InventoryClickEvent> clickEvent; Consumer<InventoryClickEvent> clickEvent;
if(stepValue == step){ if (stepValue == step) {
stepMat = Material.GREEN_STAINED_GLASS_PANE; stepMat = Material.GREEN_STAINED_GLASS_PANE;
stepName.append('a'); stepName.append('a');
stepLore = Collections.singletonList("\u00A77Value is changing by "+stepValue); stepLore = Collections.singletonList("\u00A77Value is changing by " + stepValue);
clickEvent = GuiGlobalActions.stayInPlace; clickEvent = GuiGlobalActions.stayInPlace;
}else{ } else {
stepMat = Material.RED_STAINED_GLASS_PANE; stepMat = Material.RED_STAINED_GLASS_PANE;
stepName.append('c'); stepName.append('c');
stepLore = Collections.singletonList("\u00A77Click here to change the value by "+stepValue); stepLore = Collections.singletonList("\u00A77Click here to change the value by " + stepValue);
clickEvent = updateStepValue(stepValue); clickEvent = updateStepValue(stepValue);
} }
stepName.append("Step of: ").append(stepValue); stepName.append("Step of: ").append(stepValue);
@ -233,7 +237,7 @@ public class IntSettingsGui extends AbstractSettingGui{
* @param stepValue Value to change current step to. * @param stepValue Value to change current step to.
* @return A consumer to update the current step of this setting. * @return A consumer to update the current step of this setting.
*/ */
protected Consumer<InventoryClickEvent> updateStepValue(int stepValue){ protected Consumer<InventoryClickEvent> updateStepValue(int stepValue) {
return event -> { return event -> {
event.setCancelled(true); event.setCancelled(true);
this.step = stepValue; this.step = stepValue;
@ -248,7 +252,7 @@ public class IntSettingsGui extends AbstractSettingGui{
holder.config.getConfig().set(holder.configPath, now); holder.config.getConfig().set(holder.configPath, now);
MetricsUtil.INSTANCE.notifyChange(this.holder.config, this.holder.configPath); MetricsUtil.INSTANCE.notifyChange(this.holder.config, this.holder.configPath);
if(GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE){ if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) {
return holder.config.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE); return holder.config.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE);
} }
return true; return true;
@ -261,6 +265,7 @@ public class IntSettingsGui extends AbstractSettingGui{
/** /**
* Create an int setting factory from setting's parameters. * Create an int setting factory from setting's parameters.
*
* @param title The title of the gui. * @param title The title of the gui.
* @param parent Parent gui to go back when completed. * @param parent Parent gui to go back when completed.
* @param configPath Configuration path of this setting. * @param configPath Configuration path of this setting.
@ -276,9 +281,9 @@ public class IntSettingsGui extends AbstractSettingGui{
*/ */
public static IntSettingFactory intFactory(@NotNull String title, ValueUpdatableGui parent, public static IntSettingFactory intFactory(@NotNull String title, ValueUpdatableGui parent,
String configPath, ConfigHolder config, String configPath, ConfigHolder config,
int min, int max, int defaultVal, int... steps){ int min, int max, int defaultVal, int... steps) {
return new IntSettingFactory( return new IntSettingFactory(
title,parent, title, parent,
configPath, config, configPath, config,
min, max, defaultVal, steps); min, max, defaultVal, steps);
} }
@ -286,12 +291,18 @@ public class IntSettingsGui extends AbstractSettingGui{
/** /**
* A factory for an int setting gui that hold setting's information. * A factory for an int setting gui that hold setting's information.
*/ */
public static class IntSettingFactory extends SettingGuiFactory{ public static class IntSettingFactory extends SettingGuiFactory {
@NotNull String title; ValueUpdatableGui parent; @NotNull
int min; int max; int defaultVal; int[] steps; String title;
ValueUpdatableGui parent;
int min;
int max;
int defaultVal;
int[] steps;
/** /**
* Constructor for an int setting gui factory. * Constructor for an int setting gui factory.
*
* @param title The title of the gui. * @param title The title of the gui.
* @param parent Parent gui to go back when completed. * @param parent Parent gui to go back when completed.
* @param configPath Configuration path of this setting. * @param configPath Configuration path of this setting.
@ -307,7 +318,7 @@ public class IntSettingsGui extends AbstractSettingGui{
protected IntSettingFactory( protected IntSettingFactory(
@NotNull String title, ValueUpdatableGui parent, @NotNull String title, ValueUpdatableGui parent,
String configPath, ConfigHolder config, String configPath, ConfigHolder config,
int min, int max, int defaultVal, int... steps){ int min, int max, int defaultVal, int... steps) {
super(configPath, config); super(configPath, config);
this.title = title; this.title = title;
this.parent = parent; this.parent = parent;
@ -328,7 +339,7 @@ public class IntSettingsGui extends AbstractSettingGui{
/** /**
* @return The configured value for the associated setting. * @return The configured value for the associated setting.
*/ */
public int getConfiguredValue(){ public int getConfiguredValue() {
return this.config.getConfig().getInt(this.configPath, this.defaultVal); return this.config.getConfig().getInt(this.configPath, this.defaultVal);
} }

62
src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/subsetting/EnchantConflictSubSettingGui.java
View file

@ -85,7 +85,7 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
// Displayed item will be updated later // Displayed item will be updated later
this.enchantSettingItem = new GuiItem(new ItemStack(Material.ENCHANTED_BOOK), (event)->{ this.enchantSettingItem = new GuiItem(new ItemStack(Material.ENCHANTED_BOOK), (event) -> {
event.setCancelled(true); event.setCancelled(true);
EnchantSelectSettingGui enchantGui = new EnchantSelectSettingGui( EnchantSelectSettingGui enchantGui = new EnchantSelectSettingGui(
"\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.getName()) + " \u00A75Enchantments", "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.getName()) + " \u00A75Enchantments",
@ -93,7 +93,7 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
enchantGui.show(event.getWhoClicked()); enchantGui.show(event.getWhoClicked());
}, CustomAnvil.instance); }, CustomAnvil.instance);
this.groupSettingItem = new GuiItem(new ItemStack(Material.PAPER), (event)->{ this.groupSettingItem = new GuiItem(new ItemStack(Material.PAPER), (event) -> {
event.setCancelled(true); event.setCancelled(true);
GroupSelectSettingGui enchantGui = new GroupSelectSettingGui( GroupSelectSettingGui enchantGui = new GroupSelectSettingGui(
"\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.getName()) + " \u00A73Groups", "\u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.getName()) + " \u00A73Groups",
@ -103,7 +103,7 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
this.minBeforeActiveSettingFactory = IntSettingsGui.intFactory( this.minBeforeActiveSettingFactory = IntSettingsGui.intFactory(
"\u00A78Minimum enchantment count", "\u00A78Minimum enchantment count",
this, this.enchantConflict.getName()+".maxEnchantmentBeforeConflict", ConfigHolder.CONFLICT_HOLDER, this, this.enchantConflict.getName() + ".maxEnchantmentBeforeConflict", ConfigHolder.CONFLICT_HOLDER,
0, 255, 0, 1 0, 255, 0, 1
); );
@ -116,7 +116,7 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
} }
private ConfirmActionGui createDeleteGui() { private ConfirmActionGui createDeleteGui() {
Supplier<Boolean> deleteSupplier = () ->{ Supplier<Boolean> deleteSupplier = () -> {
EnchantConflictManager manager = ConfigHolder.CONFLICT_HOLDER.getConflictManager(); EnchantConflictManager manager = ConfigHolder.CONFLICT_HOLDER.getConflictManager();
// Remove from manager // Remove from manager
@ -136,14 +136,14 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
// Save // Save
boolean success = true; boolean success = true;
if(GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE){ if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) {
success = ConfigHolder.CONFLICT_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE); success = ConfigHolder.CONFLICT_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE);
} }
return success; return success;
}; };
return new ConfirmActionGui("\u00A7cDelete \u00A7e"+CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.getName())+"\u00A7c?", return new ConfirmActionGui("\u00A7cDelete \u00A7e" + CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.getName()) + "\u00A7c?",
"\u00A77Confirm that you want to delete this conflict.", "\u00A77Confirm that you want to delete this conflict.",
this, this.parent, deleteSupplier this, this.parent, deleteSupplier
); );
@ -155,16 +155,16 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
// Parent should call updateLocal // Parent should call updateLocal
} }
public void updateLocal(){ public void updateLocal() {
if(!this.shouldWorld) return; if (!this.shouldWorld) return;
// Prepare enchantment lore // Prepare enchantment lore
ArrayList<String> enchantLore = new ArrayList<>(); ArrayList<String> enchantLore = new ArrayList<>();
enchantLore.add("\u00A77Allow you to select a list of \u00A75Enchantments \u00A77that this conflict should include"); enchantLore.add("\u00A77Allow you to select a list of \u00A75Enchantments \u00A77that this conflict should include");
Set<Enchantment> enchants = getSelectedEnchantments(); Set<Enchantment> enchants = getSelectedEnchantments();
if(enchants.isEmpty()){ if (enchants.isEmpty()) {
enchantLore.add("\u00A77There is no included enchantment for this conflict."); enchantLore.add("\u00A77There is no included enchantment for this conflict.");
}else{ } else {
enchantLore.add("\u00A77List of included enchantment for this conflict:"); enchantLore.add("\u00A77List of included enchantment for this conflict:");
Iterator<Enchantment> enchantIterator = enchants.iterator(); Iterator<Enchantment> enchantIterator = enchants.iterator();
@ -175,8 +175,8 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
String formattedName = CasedStringUtil.snakeToUpperSpacedCase(enchantIterator.next().getKey().getKey()); String formattedName = CasedStringUtil.snakeToUpperSpacedCase(enchantIterator.next().getKey().getKey());
enchantLore.add("\u00A77- \u00A75" + formattedName); enchantLore.add("\u00A77- \u00A75" + formattedName);
} }
if(greaterThanMax){ if (greaterThanMax) {
enchantLore.add("\u00A77And "+(enchants.size()-4)+" more..."); enchantLore.add("\u00A77And " + (enchants.size() - 4) + " more...");
} }
} }
@ -185,9 +185,9 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
ArrayList<String> groupLore = new ArrayList<>(); ArrayList<String> groupLore = new ArrayList<>();
groupLore.add("\u00A77Allow you to select a list of \u00A73Groups \u00A77that this conflict should include"); groupLore.add("\u00A77Allow you to select a list of \u00A73Groups \u00A77that this conflict should include");
Set<AbstractMaterialGroup> grouos = getSelectedGroups(); Set<AbstractMaterialGroup> grouos = getSelectedGroups();
if(grouos.isEmpty()){ if (grouos.isEmpty()) {
groupLore.add("\u00A77There is no excluded groups for this conflict."); groupLore.add("\u00A77There is no excluded groups for this conflict.");
}else{ } else {
groupLore.add("\u00A77List of excluded groups for this conflict:"); groupLore.add("\u00A77List of excluded groups for this conflict:");
Iterator<AbstractMaterialGroup> groupIterator = grouos.iterator(); Iterator<AbstractMaterialGroup> groupIterator = grouos.iterator();
@ -199,8 +199,8 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
groupLore.add("\u00A77- \u00A73" + formattedName); groupLore.add("\u00A77- \u00A73" + formattedName);
} }
if(greaterThanMax){ if (greaterThanMax) {
groupLore.add("\u00A77And "+(grouos.size()-4)+" more..."); groupLore.add("\u00A77And " + (grouos.size() - 4) + " more...");
} }
} }
@ -231,7 +231,7 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
update(); update();
} }
public void cleanUnused(){ public void cleanUnused() {
for (HumanEntity viewer : getViewers()) { for (HumanEntity viewer : getViewers()) {
this.parent.show(viewer); this.parent.show(viewer);
} }
@ -247,9 +247,9 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
@Override @Override
public void show(@NotNull HumanEntity humanEntity) { public void show(@NotNull HumanEntity humanEntity) {
if(this.shouldWorld){ if (this.shouldWorld) {
super.show(humanEntity); super.show(humanEntity);
}else{ } else {
this.parent.show(humanEntity); this.parent.show(humanEntity);
} }
} }
@ -267,8 +267,8 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
@Override @Override
public boolean setSelectedEnchantments(Set<Enchantment> enchantments) { public boolean setSelectedEnchantments(Set<Enchantment> enchantments) {
if(!this.shouldWorld) { if (!this.shouldWorld) {
CustomAnvil.instance.getLogger().info("Trying to save "+enchantConflict.getName()+" enchants but sub config is destroyed"); CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict.getName() + " enchants but sub config is destroyed");
return false; return false;
} }
@ -281,17 +281,17 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
for (Enchantment enchantment : enchantments) { for (Enchantment enchantment : enchantments) {
enchantKeys[index++] = enchantment.getKey().getKey(); enchantKeys[index++] = enchantment.getKey().getKey();
} }
ConfigHolder.CONFLICT_HOLDER.getConfig().set(enchantConflict.getName()+".enchantments", enchantKeys); ConfigHolder.CONFLICT_HOLDER.getConfig().set(enchantConflict.getName() + ".enchantments", enchantKeys);
try { try {
updateGuiValues(); updateGuiValues();
}catch (Exception e){ } catch (Exception e) {
CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating enchants for "+this.enchantConflict.getName(), e); CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating enchants for " + this.enchantConflict.getName(), e);
} }
// Save file configuration to disk // Save file configuration to disk
if(GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE){ if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) {
return ConfigHolder.CONFLICT_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE); return ConfigHolder.CONFLICT_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE);
} }
@ -312,8 +312,8 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
@Override @Override
public boolean setSelectedGroups(Set<AbstractMaterialGroup> groups) { public boolean setSelectedGroups(Set<AbstractMaterialGroup> groups) {
if(!this.shouldWorld) { if (!this.shouldWorld) {
CustomAnvil.instance.getLogger().info("Trying to save "+enchantConflict.getName()+" groups but sub config is destroyed"); CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict.getName() + " groups but sub config is destroyed");
return false; return false;
} }
@ -326,16 +326,16 @@ public class EnchantConflictSubSettingGui extends ValueUpdatableGui implements S
for (AbstractMaterialGroup group : groups) { for (AbstractMaterialGroup group : groups) {
groupsNames[index++] = group.getName(); groupsNames[index++] = group.getName();
} }
ConfigHolder.CONFLICT_HOLDER.getConfig().set(this.enchantConflict.getName()+".notAffectedGroups", groupsNames); ConfigHolder.CONFLICT_HOLDER.getConfig().set(this.enchantConflict.getName() + ".notAffectedGroups", groupsNames);
try { try {
updateGuiValues(); updateGuiValues();
}catch (Exception e){ } catch (Exception e) {
CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating group for "+this.enchantConflict.getName(), e); CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating group for " + this.enchantConflict.getName(), e);
} }
// Save file configuration to disk // Save file configuration to disk
if(GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE){ if (GuiSharedConstant.TEMPORARY_DO_SAVE_TO_DISK_EVERY_CHANGE) {
return ConfigHolder.CONFLICT_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE); return ConfigHolder.CONFLICT_HOLDER.saveToDisk(GuiSharedConstant.TEMPORARY_DO_BACKUP_EVERY_SAVE);
} }

19
src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalActions.java
View file

@ -27,6 +27,7 @@ public class GuiGlobalActions {
/** /**
* Create a consumer to create and open a new GUI. * Create a consumer to create and open a new GUI.
* Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem. * Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem.
*
* @param clazz The class of the gui to open. * @param clazz The class of the gui to open.
* It is assumed this class contain a constructor requiring arguments of argClass in the same order as argClass array. * It is assumed this class contain a constructor requiring arguments of argClass in the same order as argClass array.
* @param argClass Classes of the argument that will be passed to the constructor of the GUI class. * @param argClass Classes of the argument that will be passed to the constructor of the GUI class.
@ -36,12 +37,12 @@ public class GuiGlobalActions {
public static @NotNull Consumer<InventoryClickEvent> openGuiAction( public static @NotNull Consumer<InventoryClickEvent> openGuiAction(
@NotNull Class<? extends Gui> clazz, @NotNull Class<? extends Gui> clazz,
@NotNull Class<?>[] argClass, @NotNull Class<?>[] argClass,
@NotNull Object... args){ @NotNull Object... args) {
return event -> { return event -> {
event.setCancelled(true); event.setCancelled(true);
HumanEntity player = event.getWhoClicked(); HumanEntity player = event.getWhoClicked();
// Do not allow to open inventory if player do not have edit configuration permission // Do not allow to open inventory if player do not have edit configuration permission
if(!player.hasPermission(CustomAnvil.editConfigPermission)) { if (!player.hasPermission(CustomAnvil.editConfigPermission)) {
player.closeInventory(); player.closeInventory();
player.sendMessage(NO_EDIT_PERM); player.sendMessage(NO_EDIT_PERM);
return; return;
@ -62,22 +63,24 @@ public class GuiGlobalActions {
/** /**
* Create a consumer to create and open a new GUI. * Create a consumer to create and open a new GUI.
* Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem. * Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem.
*
* @param clazz The class of the gui to open. * @param clazz The class of the gui to open.
* It is assumed this class contain a constructor with no argument. * It is assumed this class contain a constructor with no argument.
* @return A consumer to create a new gui and open it. * @return A consumer to create a new gui and open it.
*/ */
public static @NotNull Consumer<InventoryClickEvent> openGuiAction( public static @NotNull Consumer<InventoryClickEvent> openGuiAction(
@NotNull Class<? extends Gui> clazz){ @NotNull Class<? extends Gui> clazz) {
return openGuiAction(clazz, new Class<?>[0]); return openGuiAction(clazz, new Class<?>[0]);
} }
/** /**
* Create a consumer to open a setting gui from a setting GUI factory. * Create a consumer to open a setting gui from a setting GUI factory.
* Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem. * Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem.
*
* @param factory The setting gui factory. * @param factory The setting gui factory.
* @return A consumer to create and open a new setting GUI. * @return A consumer to create and open a new setting GUI.
*/ */
public static @NotNull Consumer<InventoryClickEvent> openSettingGuiAction(AbstractSettingGui.SettingGuiFactory factory){ public static @NotNull Consumer<InventoryClickEvent> openSettingGuiAction(AbstractSettingGui.SettingGuiFactory factory) {
return event -> { return event -> {
event.setCancelled(true); event.setCancelled(true);
Gui gui = factory.create(); Gui gui = factory.create();
@ -88,6 +91,7 @@ public class GuiGlobalActions {
/** /**
* Create a consumer to open a global GUI. * Create a consumer to open a global GUI.
* Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem. * Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem.
*
* @param goal The gui to open when consumer is run. * @param goal The gui to open when consumer is run.
* @return A consumer to open a global GUI. * @return A consumer to open a global GUI.
*/ */
@ -95,7 +99,7 @@ public class GuiGlobalActions {
return event -> { return event -> {
HumanEntity player = event.getWhoClicked(); HumanEntity player = event.getWhoClicked();
// Do not allow to open inventory if player do not have edit configuration permission // Do not allow to open inventory if player do not have edit configuration permission
if(!player.hasPermission(CustomAnvil.editConfigPermission)) { if (!player.hasPermission(CustomAnvil.editConfigPermission)) {
player.closeInventory(); player.closeInventory();
player.sendMessage(NO_EDIT_PERM); player.sendMessage(NO_EDIT_PERM);
return; return;
@ -109,6 +113,7 @@ public class GuiGlobalActions {
* Create a consumer to update and open an updatable GUI. * Create a consumer to update and open an updatable GUI.
* Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem. * Used with InventoryClickEvent as the consumer argument as it is planned to be used on click on an GuiItem.
* This consumer check if the player who interacted with the item have the permission to save before saving. * This consumer check if the player who interacted with the item have the permission to save before saving.
*
* @param setting The gui that contain the modified setting. * @param setting The gui that contain the modified setting.
* @param goal The gui to update and open when consumer is run. * @param goal The gui to update and open when consumer is run.
* @return A consumer to open a global GUI. * @return A consumer to open a global GUI.
@ -120,14 +125,14 @@ public class GuiGlobalActions {
event.setCancelled(true); event.setCancelled(true);
HumanEntity player = event.getWhoClicked(); HumanEntity player = event.getWhoClicked();
// Do not allow to save configuration if player do not have edit configuration permission // Do not allow to save configuration if player do not have edit configuration permission
if(!player.hasPermission(CustomAnvil.editConfigPermission)) { if (!player.hasPermission(CustomAnvil.editConfigPermission)) {
player.closeInventory(); player.closeInventory();
player.sendMessage(NO_EDIT_PERM); player.sendMessage(NO_EDIT_PERM);
return; return;
} }
// Save setting // Save setting
if(!setting.onSave()){ if (!setting.onSave()) {
player.sendMessage("\u00A7cSomething went wrong while saving the change of value."); player.sendMessage("\u00A7cSomething went wrong while saving the change of value.");
} }
// Update gui for those who have it open. // Update gui for those who have it open.

61
src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiGlobalItems.java
View file

@ -23,6 +23,7 @@ public class GuiGlobalItems {
// statically create default back itemstack // statically create default back itemstack
private static final ItemStack BACK_ITEM; private static final ItemStack BACK_ITEM;
static { static {
BACK_ITEM = new ItemStack(Material.BARRIER); BACK_ITEM = new ItemStack(Material.BARRIER);
ItemMeta meta = BACK_ITEM.getItemMeta(); ItemMeta meta = BACK_ITEM.getItemMeta();
@ -32,32 +33,35 @@ public class GuiGlobalItems {
/** /**
* Create a GuiItem that open the given GUi. * Create a GuiItem that open the given GUi.
*
* @param item The item to display in the GUI. * @param item The item to display in the GUI.
* @param goal The GUI to open on click. * @param goal The GUI to open on click.
* @return An GuiItem that open goal on click. * @return An GuiItem that open goal on click.
*/ */
public static GuiItem goToGuiItem(@NotNull ItemStack item, @NotNull Gui goal){ public static GuiItem goToGuiItem(@NotNull ItemStack item, @NotNull Gui goal) {
return new GuiItem(item, GuiGlobalActions.openGuiAction(goal), CustomAnvil.instance); return new GuiItem(item, GuiGlobalActions.openGuiAction(goal), CustomAnvil.instance);
} }
/** /**
* Create back button item from default back GuiItem. * Create back button item from default back GuiItem.
* The back item will open the goal inventory when clicked. * The back item will open the goal inventory when clicked.
*
* @param goal The GUI to go back to. * @param goal The GUI to go back to.
* @return An GuiItem that go back to goal on click. * @return An GuiItem that go back to goal on click.
*/ */
public static GuiItem backItem(@NotNull Gui goal){ public static GuiItem backItem(@NotNull Gui goal) {
return goToGuiItem(BACK_ITEM, goal); return goToGuiItem(BACK_ITEM, goal);
} }
/** /**
* Add default back item to a GUI pattern with the reserved character key <strong>B</strong>. * Add default back item to a GUI pattern with the reserved character key <strong>B</strong>.
* The back item will open the target inventory when clicked. * The back item will open the target inventory when clicked.
*
* @param target The pattern to add the back item. * @param target The pattern to add the back item.
* @param goal The GUI to go back to. * @param goal The GUI to go back to.
*/ */
public static void addBackItem(@NotNull PatternPane target, public static void addBackItem(@NotNull PatternPane target,
@NotNull Gui goal){ @NotNull Gui goal) {
target.bindItem('B', backItem(goal)); target.bindItem('B', backItem(goal));
} }
@ -66,42 +70,47 @@ public class GuiGlobalItems {
/** /**
* Get a background item with backgroundMat as the displayed material. * Get a background item with backgroundMat as the displayed material.
* A background item is a GuiItem that do nothing when interacted with and have an empty name. * A background item is a GuiItem that do nothing when interacted with and have an empty name.
*
* @param backgroundMat The material to which the background item should be made of. * @param backgroundMat The material to which the background item should be made of.
* @return A background item with backgroundMat as material. * @return A background item with backgroundMat as material.
*/ */
public static GuiItem backgroundItem(Material backgroundMat){ public static GuiItem backgroundItem(Material backgroundMat) {
ItemStack item = new ItemStack(backgroundMat); ItemStack item = new ItemStack(backgroundMat);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName("\u00A7c"); meta.setDisplayName("\u00A7c");
item.setItemMeta(meta); item.setItemMeta(meta);
return new GuiItem(item, GuiGlobalActions.stayInPlace, CustomAnvil.instance); return new GuiItem(item, GuiGlobalActions.stayInPlace, CustomAnvil.instance);
} }
/** /**
* Get default background GuiItem. * Get default background GuiItem.
* A background item is a GuiItem that do nothing when interacted with and have an empty name. * A background item is a GuiItem that do nothing when interacted with and have an empty name.
*
* @return A new instance of the default background item. * @return A new instance of the default background item.
*/ */
public static GuiItem backgroundItem(){ public static GuiItem backgroundItem() {
return backgroundItem(DEFAULT_BACKGROUND_MAT); return backgroundItem(DEFAULT_BACKGROUND_MAT);
} }
/** /**
* Add default background item to a GUI pattern with the reserved character key <strong>0</strong>. * Add default background item to a GUI pattern with the reserved character key <strong>0</strong>.
* A background item is a GuiItem that do nothing when interacted with and have an empty name. * A background item is a GuiItem that do nothing when interacted with and have an empty name.
*
* @param target The pattern to add the background item. * @param target The pattern to add the background item.
* @param backgroundMat The material of the background item. * @param backgroundMat The material of the background item.
*/ */
public static void addBackgroundItem(@NotNull PatternPane target, public static void addBackgroundItem(@NotNull PatternPane target,
@NotNull Material backgroundMat){ @NotNull Material backgroundMat) {
target.bindItem('0', backgroundItem(backgroundMat)); target.bindItem('0', backgroundItem(backgroundMat));
} }
/** /**
* Add default background item to a GUI pattern with the reserved character key <strong>0</strong>. * Add default background item to a GUI pattern with the reserved character key <strong>0</strong>.
* A background item is a GuiItem that do nothing when interacted with and have an empty name. * A background item is a GuiItem that do nothing when interacted with and have an empty name.
*
* @param target The pattern to add the background item. * @param target The pattern to add the background item.
*/ */
public static void addBackgroundItem(@NotNull PatternPane target){ public static void addBackgroundItem(@NotNull PatternPane target) {
addBackgroundItem(target, DEFAULT_BACKGROUND_MAT); addBackgroundItem(target, DEFAULT_BACKGROUND_MAT);
} }
@ -112,13 +121,14 @@ public class GuiGlobalItems {
* Create a new save setting GuiItem. * Create a new save setting GuiItem.
* A save setting item is a GuiItem that save a changed setting when clicked. * A save setting item is a GuiItem that save a changed setting when clicked.
* This item also check if the player who interacted with the item have the permission to save before saving. * This item also check if the player who interacted with the item have the permission to save before saving.
*
* @param setting The setting to change. * @param setting The setting to change.
* @param goal Parent GUI of this setting GUI. as setting will be change the display of goal GUI will be updated. * @param goal Parent GUI of this setting GUI. as setting will be change the display of goal GUI will be updated.
* @return A save setting item. * @return A save setting item.
*/ */
public static GuiItem saveItem( public static GuiItem saveItem(
@NotNull AbstractSettingGui setting, @NotNull AbstractSettingGui setting,
@NotNull ValueUpdatableGui goal){ @NotNull ValueUpdatableGui goal) {
ItemStack item = new ItemStack(DEFAULT_SAVE_ITEM); ItemStack item = new ItemStack(DEFAULT_SAVE_ITEM);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
@ -131,26 +141,29 @@ public class GuiGlobalItems {
// Create static non change item // Create static non change item
private static final GuiItem NO_CHANGE_ITEM; private static final GuiItem NO_CHANGE_ITEM;
static { static {
ItemStack item = new ItemStack(DEFAULT_NO_CHANGE_ITEM); ItemStack item = new ItemStack(DEFAULT_NO_CHANGE_ITEM);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName("\u00A77No change. can't save."); meta.setDisplayName("\u00A77No change. can't save.");
item.setItemMeta(meta); item.setItemMeta(meta);
NO_CHANGE_ITEM = new GuiItem(item,GuiGlobalActions.stayInPlace, CustomAnvil.instance); NO_CHANGE_ITEM = new GuiItem(item, GuiGlobalActions.stayInPlace, CustomAnvil.instance);
} }
/** /**
* Get the global "no change" GuiItem. * Get the global "no change" GuiItem.
* The no change item do nothing when interacted, only the title is change to show there is no change. * The no change item do nothing when interacted, only the title is change to show there is no change.
*
* @return The global "no change" item. * @return The global "no change" item.
*/ */
public static GuiItem noChangeItem(){ public static GuiItem noChangeItem() {
return NO_CHANGE_ITEM; return NO_CHANGE_ITEM;
} }
/** /**
* Create a new "create and go to the setting GUI" GuiItem. * Create a new "create and go to the setting GUI" GuiItem.
* This item will create and open a setting GUI from the factory. * This item will create and open a setting GUI from the factory.
*
* @param item The item that will be displayed. * @param item The item that will be displayed.
* @param factory The setting's GUI factory. * @param factory The setting's GUI factory.
* @return A formatted GuiItem that will create and open a GUI for the setting. * @return A formatted GuiItem that will create and open a GUI for the setting.
@ -158,7 +171,7 @@ public class GuiGlobalItems {
public static GuiItem openSettingGuiItem( public static GuiItem openSettingGuiItem(
@NotNull ItemStack item, @NotNull ItemStack item,
@NotNull AbstractSettingGui.SettingGuiFactory factory @NotNull AbstractSettingGui.SettingGuiFactory factory
){ ) {
return new GuiItem(item, GuiGlobalActions.openSettingGuiAction(factory), CustomAnvil.instance); return new GuiItem(item, GuiGlobalActions.openSettingGuiAction(factory), CustomAnvil.instance);
} }
@ -169,6 +182,7 @@ public class GuiGlobalItems {
* Create a new Boolean setting GuiItem. * Create a new Boolean setting GuiItem.
* This item will create and open a boolean setting GUI from the factory. * This item will create and open a boolean setting GUI from the factory.
* The item will have its value written in the lore part of the item. * The item will have its value written in the lore part of the item.
*
* @param factory The setting's GUI factory. * @param factory The setting's GUI factory.
* @param name Name of the item. * @param name Name of the item.
* @return A formatted GuiItem that will create and open a GUI for the boolean setting. * @return A formatted GuiItem that will create and open a GUI for the boolean setting.
@ -176,16 +190,16 @@ public class GuiGlobalItems {
public static GuiItem boolSettingGuiItem( public static GuiItem boolSettingGuiItem(
@NotNull BoolSettingsGui.BoolSettingFactory factory, @NotNull BoolSettingsGui.BoolSettingFactory factory,
@NotNull String name @NotNull String name
){ ) {
// Get item properties // Get item properties
boolean value = factory.getConfiguredValue(); boolean value = factory.getConfiguredValue();
Material itemMat; Material itemMat;
StringBuilder itemName = new StringBuilder("\u00A7"); StringBuilder itemName = new StringBuilder("\u00A7");
if(value){ if (value) {
itemMat = Material.GREEN_TERRACOTTA; itemMat = Material.GREEN_TERRACOTTA;
itemName.append("a"); itemName.append("a");
}else{ } else {
itemMat = Material.RED_TERRACOTTA; itemMat = Material.RED_TERRACOTTA;
itemName.append("c"); itemName.append("c");
} }
@ -199,12 +213,13 @@ public class GuiGlobalItems {
* This item will create and open a boolean setting GUI from the factory. * This item will create and open a boolean setting GUI from the factory.
* The item will have its value written in the lore part of the item. * The item will have its value written in the lore part of the item.
* Item's name will be the factory set title. * Item's name will be the factory set title.
*
* @param factory The setting's GUI factory. * @param factory The setting's GUI factory.
* @return A formatted GuiItem that will create and open a GUI for the boolean setting. * @return A formatted GuiItem that will create and open a GUI for the boolean setting.
*/ */
public static GuiItem boolSettingGuiItem( public static GuiItem boolSettingGuiItem(
@NotNull BoolSettingsGui.BoolSettingFactory factory @NotNull BoolSettingsGui.BoolSettingFactory factory
){ ) {
String configPath = getConfigNameFromPath(factory.getConfigPath()); String configPath = getConfigNameFromPath(factory.getConfigPath());
return boolSettingGuiItem(factory, CasedStringUtil.snakeToUpperSpacedCase(configPath)); return boolSettingGuiItem(factory, CasedStringUtil.snakeToUpperSpacedCase(configPath));
} }
@ -213,6 +228,7 @@ public class GuiGlobalItems {
* Create a new int setting GuiItem. * Create a new int setting GuiItem.
* This item will create and open an int setting GUI from the factory. * This item will create and open an int setting GUI from the factory.
* The item will have its value written in the lore part of the item. * The item will have its value written in the lore part of the item.
*
* @param factory The setting's GUI factory. * @param factory The setting's GUI factory.
* @param itemMat Displayed material of the item. * @param itemMat Displayed material of the item.
* @param name Name of the item. * @param name Name of the item.
@ -222,7 +238,7 @@ public class GuiGlobalItems {
@NotNull IntSettingsGui.IntSettingFactory factory, @NotNull IntSettingsGui.IntSettingFactory factory,
@NotNull Material itemMat, @NotNull Material itemMat,
@NotNull String name @NotNull String name
){ ) {
// Get item properties // Get item properties
int value = factory.getConfiguredValue(); int value = factory.getConfiguredValue();
StringBuilder itemName = new StringBuilder("\u00A7a").append(name); StringBuilder itemName = new StringBuilder("\u00A7a").append(name);
@ -235,6 +251,7 @@ public class GuiGlobalItems {
* This item will create and open an int setting GUI from the factory. * This item will create and open an int setting GUI from the factory.
* The item will have its value written in the lore part of the item. * The item will have its value written in the lore part of the item.
* Item's name will be the factory set title. * Item's name will be the factory set title.
*
* @param factory The setting's GUI factory. * @param factory The setting's GUI factory.
* @param itemMat Displayed material of the item. * @param itemMat Displayed material of the item.
* @return A formatted GuiItem that will create and open a GUI for the int setting. * @return A formatted GuiItem that will create and open a GUI for the int setting.
@ -242,13 +259,14 @@ public class GuiGlobalItems {
public static GuiItem intSettingGuiItem( public static GuiItem intSettingGuiItem(
@NotNull IntSettingsGui.IntSettingFactory factory, @NotNull IntSettingsGui.IntSettingFactory factory,
@NotNull Material itemMat @NotNull Material itemMat
){ ) {
String configPath = getConfigNameFromPath(factory.getConfigPath()); String configPath = getConfigNameFromPath(factory.getConfigPath());
return intSettingGuiItem(factory, itemMat, CasedStringUtil.detectToUpperSpacedCase(configPath)); return intSettingGuiItem(factory, itemMat, CasedStringUtil.detectToUpperSpacedCase(configPath));
} }
/** /**
* Create an arbitrary GuiItem from a unique setting and item's property. * Create an arbitrary GuiItem from a unique setting and item's property.
*
* @param factory The setting's GUI factory. * @param factory The setting's GUI factory.
* @param itemMat Displayed material of the item. * @param itemMat Displayed material of the item.
* @param itemName Name of the item. * @param itemName Name of the item.
@ -261,13 +279,13 @@ public class GuiGlobalItems {
@NotNull Material itemMat, @NotNull Material itemMat,
@NotNull StringBuilder itemName, @NotNull StringBuilder itemName,
@NotNull Object value @NotNull Object value
){ ) {
// Create & initialise item // Create & initialise item
ItemStack item = new ItemStack(itemMat); ItemStack item = new ItemStack(itemMat);
ItemMeta itemMeta = item.getItemMeta(); ItemMeta itemMeta = item.getItemMeta();
itemMeta.setDisplayName(itemName.toString()); itemMeta.setDisplayName(itemName.toString());
itemMeta.setLore(Collections.singletonList(SETTING_ITEM_LORE_PREFIX+value)); itemMeta.setLore(Collections.singletonList(SETTING_ITEM_LORE_PREFIX + value));
item.setItemMeta(itemMeta); item.setItemMeta(itemMeta);
// Create GuiItem // Create GuiItem
@ -277,14 +295,15 @@ public class GuiGlobalItems {
/** /**
* Get the setting name from the setting path. * Get the setting name from the setting path.
* For example: "gui.command.name" will return "name". * For example: "gui.command.name" will return "name".
*
* @param path The setting's path. * @param path The setting's path.
* @return The setting's name. * @return The setting's name.
*/ */
public static String getConfigNameFromPath(String path){ public static String getConfigNameFromPath(String path) {
// Get index of first dot // Get index of first dot
int indexOfDot = path.indexOf("."); int indexOfDot = path.indexOf(".");
// when indexOfDot == -1 (not fond), it is implied that indexOfDot+1 = 0. substring will keep the full path as expected // when indexOfDot == -1 (not fond), it is implied that indexOfDot+1 = 0. substring will keep the full path as expected
return path.substring(indexOfDot+1); return path.substring(indexOfDot + 1);
} }
} }

1
src/main/java/xyz/alexcrea/cuanvil/gui/util/GuiSharedConstant.java
View file

@ -31,6 +31,7 @@ public class GuiSharedConstant {
public static final boolean TEMPORARY_DO_BACKUP_EVERY_SAVE = true; public static final boolean TEMPORARY_DO_BACKUP_EVERY_SAVE = true;
public static final PatternPane BACK_TO_MAIN_MENU_BIG_LIST_DISPLAY_BACKGROUND_PANE; public static final PatternPane BACK_TO_MAIN_MENU_BIG_LIST_DISPLAY_BACKGROUND_PANE;
static { static {
Pattern pattern = new Pattern( Pattern pattern = new Pattern(
GuiSharedConstant.EMPTY_GUI_FULL_LINE, GuiSharedConstant.EMPTY_GUI_FULL_LINE,

19
src/main/java/xyz/alexcrea/cuanvil/util/CasedStringUtil.java
View file

@ -9,17 +9,18 @@ public class CasedStringUtil {
* Transform a snake cased string to an upper-cased spaced string. * Transform a snake cased string to an upper-cased spaced string.
* <p> * <p>
* for example: if we use "hello_world" as an input this function will return "Hello World". * for example: if we use "hello_world" as an input this function will return "Hello World".
*
* @param snake_cased_string The input string. * @param snake_cased_string The input string.
* This argument NEED to be a snake cased string, or it will not work * This argument NEED to be a snake cased string, or it will not work
* @return The input as an upper-cased string with space separator. * @return The input as an upper-cased string with space separator.
*/ */
public static String snakeToUpperSpacedCase(String snake_cased_string){ public static String snakeToUpperSpacedCase(String snake_cased_string) {
if(snake_cased_string.contentEquals("")) return ""; if (snake_cased_string.contentEquals("")) return "";
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
for (String word : snake_cased_string.split("_")) { for (String word : snake_cased_string.split("_")) {
result.append(" "); result.append(" ");
if(word.isEmpty()) continue; if (word.isEmpty()) continue;
char firstChar = word.charAt(0); char firstChar = word.charAt(0);
result.append(Character.toUpperCase(firstChar)); result.append(Character.toUpperCase(firstChar));
@ -28,15 +29,15 @@ public class CasedStringUtil {
return result.substring(1); return result.substring(1);
} }
public static String camelCaseToUpperSpaceCase(String camelCasedString){ public static String camelCaseToUpperSpaceCase(String camelCasedString) {
if(camelCasedString.isEmpty()) return camelCasedString; if (camelCasedString.isEmpty()) return camelCasedString;
StringBuilder stb = new StringBuilder(); StringBuilder stb = new StringBuilder();
char[] chars = camelCasedString.toCharArray(); char[] chars = camelCasedString.toCharArray();
stb.append(chars[0]); stb.append(chars[0]);
for (int i = 1; i < chars.length; i++) { for (int i = 1; i < chars.length; i++) {
char chr = chars[i]; char chr = chars[i];
if(Character.isUpperCase(chr)){ if (Character.isUpperCase(chr)) {
stb.append(" "); stb.append(" ");
} }
stb.append(chr); stb.append(chr);
@ -45,11 +46,11 @@ public class CasedStringUtil {
return stb.toString(); return stb.toString();
} }
public static String detectToUpperSpacedCase(String toDetect){ public static String detectToUpperSpacedCase(String toDetect) {
//not advanced detection //not advanced detection
if(toDetect.contains("_")){ if (toDetect.contains("_")) {
return snakeToUpperSpacedCase(toDetect); return snakeToUpperSpacedCase(toDetect);
}else{ } else {
return camelCaseToUpperSpaceCase(toDetect); return camelCaseToUpperSpaceCase(toDetect);
} }
} }

178
src/main/kotlin/io/delilaheve/AnvilEventListener.kt
View file

@ -39,9 +39,10 @@ class AnvilEventListener : Listener {
private const val ANVIL_INPUT_LEFT = 0 private const val ANVIL_INPUT_LEFT = 0
private const val ANVIL_INPUT_RIGHT = 1 private const val ANVIL_INPUT_RIGHT = 1
private const val ANVIL_OUTPUT_SLOT = 2 private const val ANVIL_OUTPUT_SLOT = 2
// static slot container // static slot container
private val NO_SLOT = SlotContainer(SlotType.NO_SLOT,0) private val NO_SLOT = SlotContainer(SlotType.NO_SLOT, 0)
private val CURSOR_SLOT = SlotContainer(SlotType.CURSOR,0) private val CURSOR_SLOT = SlotContainer(SlotType.CURSOR, 0)
} }
/** /**
@ -55,15 +56,15 @@ class AnvilEventListener : Listener {
// Should find player // Should find player
val player = event.view.player val player = event.view.player
if(!player.hasPermission(CustomAnvil.affectedByPluginPermission)) return if (!player.hasPermission(CustomAnvil.affectedByPluginPermission)) return
// Test rename lonely item // Test rename lonely item
if(second == null){ if (second == null) {
val resultItem = first.clone() val resultItem = first.clone()
var anvilCost = handleRename(resultItem, inventory) var anvilCost = handleRename(resultItem, inventory)
// Test/stop if nothing changed. // Test/stop if nothing changed.
if(first == resultItem){ if (first == resultItem) {
CustomAnvil.log("no right item, But input is same as output") CustomAnvil.log("no right item, But input is same as output")
event.result = null event.result = null
return return
@ -71,7 +72,7 @@ class AnvilEventListener : Listener {
// We don't manually set item here as vanilla do it (renaming) // We don't manually set item here as vanilla do it (renaming)
//event.result = null //event.result = null
anvilCost+= calculatePenalty(first,null,resultItem) anvilCost += calculatePenalty(first, null, resultItem)
handleAnvilXp(inventory, event, anvilCost) handleAnvilXp(inventory, event, anvilCost)
return return
@ -91,19 +92,19 @@ class AnvilEventListener : Listener {
if (!first.isEnchantedBook() && !second.isEnchantedBook()) { if (!first.isEnchantedBook() && !second.isEnchantedBook()) {
// we only need to be concerned with repair when neither item is a book // we only need to be concerned with repair when neither item is a book
val repaired = resultItem.repairFrom(first, second) val repaired = resultItem.repairFrom(first, second)
anvilCost += if(repaired) ConfigOptions.itemRepairCost else 0 anvilCost += if (repaired) ConfigOptions.itemRepairCost else 0
} }
// Test/stop if nothing changed. // Test/stop if nothing changed.
if(first == resultItem){ if (first == resultItem) {
CustomAnvil.log("Mergable with second, But input is same as output") CustomAnvil.log("Mergable with second, But input is same as output")
event.result = null event.result = null
return return
} }
// As calculatePenalty edit result, we need to calculate penalty after checking equality // As calculatePenalty edit result, we need to calculate penalty after checking equality
anvilCost+= calculatePenalty(first, second, resultItem) anvilCost += calculatePenalty(first, second, resultItem)
// Calculate rename cost // Calculate rename cost
anvilCost+= handleRename(resultItem, inventory) anvilCost += handleRename(resultItem, inventory)
// Finally, we set result // Finally, we set result
event.result = resultItem event.result = resultItem
@ -114,19 +115,19 @@ class AnvilEventListener : Listener {
// Test for unit repair // Test for unit repair
val unitRepairAmount = first.getRepair(second) val unitRepairAmount = first.getRepair(second)
if(unitRepairAmount != null){ if (unitRepairAmount != null) {
val resultItem = first.clone() val resultItem = first.clone()
var anvilCost = handleRename(resultItem, inventory) var anvilCost = handleRename(resultItem, inventory)
val repairAmount = resultItem.unitRepair(second.amount, unitRepairAmount) val repairAmount = resultItem.unitRepair(second.amount, unitRepairAmount)
if(repairAmount > 0){ if (repairAmount > 0) {
anvilCost += repairAmount*ConfigOptions.unitRepairCost anvilCost += repairAmount * ConfigOptions.unitRepairCost
} }
// We do not care about right item penalty for unit repair // We do not care about right item penalty for unit repair
anvilCost+= calculatePenalty(first,null,resultItem) anvilCost += calculatePenalty(first, null, resultItem)
// Test/stop if nothing changed. // Test/stop if nothing changed.
if(first == resultItem){ if (first == resultItem) {
CustomAnvil.log("unit repair, But input is same as output") CustomAnvil.log("unit repair, But input is same as output")
event.result = null event.result = null
return return
@ -134,16 +135,16 @@ class AnvilEventListener : Listener {
event.result = resultItem event.result = resultItem
handleAnvilXp(inventory, event, anvilCost) handleAnvilXp(inventory, event, anvilCost)
}else{ } else {
CustomAnvil.log("no anvil fuse type found") CustomAnvil.log("no anvil fuse type found")
event.result = null event.result = null
} }
} }
private fun handleRename(resultItem: ItemStack, inventory: AnvilInventory): Int{ private fun handleRename(resultItem: ItemStack, inventory: AnvilInventory): Int {
// Rename item and add renaming cost // Rename item and add renaming cost
resultItem.itemMeta?.let { resultItem.itemMeta?.let {
if(!it.displayName.contentEquals(inventory.renameText)){ if (!it.displayName.contentEquals(inventory.renameText)) {
it.setDisplayName(inventory.renameText) it.setDisplayName(inventory.renameText)
resultItem.itemMeta = it resultItem.itemMeta = it
return ConfigOptions.itemRenameCost return ConfigOptions.itemRenameCost
@ -158,9 +159,11 @@ class AnvilEventListener : Listener {
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
fun anvilExtractionCheck(event: InventoryClickEvent) { fun anvilExtractionCheck(event: InventoryClickEvent) {
val player = event.whoClicked as? Player ?: return val player = event.whoClicked as? Player ?: return
if(!player.hasPermission(CustomAnvil.affectedByPluginPermission)) return if (!player.hasPermission(CustomAnvil.affectedByPluginPermission)) return
val inventory = event.inventory as? AnvilInventory ?: return val inventory = event.inventory as? AnvilInventory ?: return
if (event.rawSlot != ANVIL_OUTPUT_SLOT) { return } if (event.rawSlot != ANVIL_OUTPUT_SLOT) {
return
}
val output = inventory.getItem(ANVIL_OUTPUT_SLOT) ?: return val output = inventory.getItem(ANVIL_OUTPUT_SLOT) ?: return
val leftItem = inventory.getItem(ANVIL_INPUT_LEFT) ?: return val leftItem = inventory.getItem(ANVIL_INPUT_LEFT) ?: return
val rightItem = inventory.getItem(ANVIL_INPUT_RIGHT) val rightItem = inventory.getItem(ANVIL_INPUT_RIGHT)
@ -172,110 +175,117 @@ class AnvilEventListener : Listener {
|| (unitRepairResult != null) || (unitRepairResult != null)
// True if there was no change or not allowed // True if there was no change or not allowed
if((output == inventory.getItem(ANVIL_INPUT_LEFT)) if ((output == inventory.getItem(ANVIL_INPUT_LEFT))
|| !allowed){ || !allowed
) {
event.result = Event.Result.DENY event.result = Event.Result.DENY
return return
} }
if(rightItem == null){ if (rightItem == null) {
event.result = Event.Result.ALLOW event.result = Event.Result.ALLOW
return return
} }
if(canMerge){ if (canMerge) {
event.result = Event.Result.ALLOW event.result = Event.Result.ALLOW
}else if(unitRepairResult != null){ } else if (unitRepairResult != null) {
onUnitRepairExtract(leftItem, rightItem, output, onUnitRepairExtract(
unitRepairResult, event, player, inventory) leftItem, rightItem, output,
unitRepairResult, event, player, inventory
)
return return
} }
} }
private fun onUnitRepairExtract(leftItem: ItemStack, private fun onUnitRepairExtract(
leftItem: ItemStack,
rightItem: ItemStack, rightItem: ItemStack,
output: ItemStack, output: ItemStack,
unitRepairResult: Double, unitRepairResult: Double,
event: InventoryClickEvent, event: InventoryClickEvent,
player: Player, player: Player,
inventory: AnvilInventory){ inventory: AnvilInventory
) {
val resultCopy = leftItem.clone() val resultCopy = leftItem.clone()
val resultAmount = resultCopy.unitRepair( val resultAmount = resultCopy.unitRepair(
rightItem.amount, unitRepairResult) rightItem.amount, unitRepairResult
)
// To avoid vanilla, we cancel the event for unit repair // To avoid vanilla, we cancel the event for unit repair
event.result = Event.Result.DENY event.result = Event.Result.DENY
event.isCancelled = true event.isCancelled = true
// And we give the item manually // And we give the item manually
// But first we check if we should give the item // But first we check if we should give the item
val slotDestination = getActionSlot(event,player) val slotDestination = getActionSlot(event, player)
if(slotDestination.type == SlotType.NO_SLOT) return if (slotDestination.type == SlotType.NO_SLOT) return
// Test repair cost // Test repair cost
var repairCost = 0 var repairCost = 0
if(player.gameMode != GameMode.CREATIVE){ if (player.gameMode != GameMode.CREATIVE) {
// Get repairCost // Get repairCost
leftItem.itemMeta?.let { leftMeta -> leftItem.itemMeta?.let { leftMeta ->
val leftName = leftMeta.displayName val leftName = leftMeta.displayName
output.itemMeta?.let { output.itemMeta?.let {
if(!leftName.contentEquals(it.displayName)){ if (!leftName.contentEquals(it.displayName)) {
repairCost+= ConfigOptions.itemRenameCost repairCost += ConfigOptions.itemRenameCost
} }
} }
} }
repairCost+= calculatePenalty(leftItem,null,resultCopy) repairCost += calculatePenalty(leftItem, null, resultCopy)
repairCost+= resultAmount*ConfigOptions.unitRepairCost repairCost += resultAmount * ConfigOptions.unitRepairCost
if((inventory.maximumRepairCost < repairCost) if ((inventory.maximumRepairCost < repairCost)
|| (player.level < repairCost)) return || (player.level < repairCost)
) return
} }
// If not creative middle click... // If not creative middle click...
if(event.click != ClickType.MIDDLE){ if (event.click != ClickType.MIDDLE) {
// We remove what should be removed // We remove what should be removed
inventory.setItem(ANVIL_INPUT_LEFT,null) inventory.setItem(ANVIL_INPUT_LEFT, null)
rightItem.amount-= resultAmount rightItem.amount -= resultAmount
inventory.setItem(ANVIL_INPUT_RIGHT,rightItem) inventory.setItem(ANVIL_INPUT_RIGHT, rightItem)
inventory.setItem(ANVIL_OUTPUT_SLOT, null) inventory.setItem(ANVIL_OUTPUT_SLOT, null)
player.level-= repairCost player.level -= repairCost
} }
// Finally, we add the item to the player // Finally, we add the item to the player
if(slotDestination.type == SlotType.CURSOR){ if (slotDestination.type == SlotType.CURSOR) {
player.setItemOnCursor(output) player.setItemOnCursor(output)
}else{// We assume SlotType == SlotType.INVENTORY } else {// We assume SlotType == SlotType.INVENTORY
player.inventory.setItem(slotDestination.slot,output) player.inventory.setItem(slotDestination.slot, output)
} }
} }
/** /**
* Get the destination slot or "NO_SLOT" slot container if there is no slot available * Get the destination slot or "NO_SLOT" slot container if there is no slot available
*/ */
private fun getActionSlot(event: InventoryClickEvent, player: Player): SlotContainer{ private fun getActionSlot(event: InventoryClickEvent, player: Player): SlotContainer {
if(event.isShiftClick){ if (event.isShiftClick) {
val inventory = player.inventory val inventory = player.inventory
val firstEmpty = inventory.firstEmpty() val firstEmpty = inventory.firstEmpty()
if(firstEmpty == -1){ if (firstEmpty == -1) {
return NO_SLOT return NO_SLOT
} }
//check hotbare full //check hotbare full
var slotIndex = 8 var slotIndex = 8
while(slotIndex >= 0 && ((inventory.getItem(slotIndex)?.type ?: Material.AIR) != Material.AIR)){ while (slotIndex >= 0 && ((inventory.getItem(slotIndex)?.type ?: Material.AIR) != Material.AIR)) {
slotIndex-- slotIndex--
} }
if(slotIndex >= 0){ if (slotIndex >= 0) {
return SlotContainer(SlotType.INVENTORY,slotIndex) return SlotContainer(SlotType.INVENTORY, slotIndex)
} }
slotIndex = 35 //4*9 - 1 (max of player inventory) slotIndex = 35 //4*9 - 1 (max of player inventory)
while(slotIndex >= 9 && ((inventory.getItem(slotIndex)?.type ?: Material.AIR) != Material.AIR)){ while (slotIndex >= 9 && ((inventory.getItem(slotIndex)?.type ?: Material.AIR) != Material.AIR)) {
slotIndex-- slotIndex--
} }
if(slotIndex < 9){ if (slotIndex < 9) {
return NO_SLOT return NO_SLOT
} }
return SlotContainer(SlotType.INVENTORY,slotIndex) return SlotContainer(SlotType.INVENTORY, slotIndex)
}else{ } else {
if(player.itemOnCursor.type != Material.AIR){ if (player.itemOnCursor.type != Material.AIR) {
return NO_SLOT return NO_SLOT
} }
return CURSOR_SLOT return CURSOR_SLOT
@ -286,24 +296,29 @@ class AnvilEventListener : Listener {
* Function to calculate work penalty of anvil work * Function to calculate work penalty of anvil work
* Also change result work penalty * Also change result work penalty
*/ */
private fun calculatePenalty(left: ItemStack, right: ItemStack?, result: ItemStack): Int{ private fun calculatePenalty(left: ItemStack, right: ItemStack?, result: ItemStack): Int {
// Extracted From https://minecraft.fandom.com/wiki/Anvil_mechanics#Enchantment_equation // Extracted From https://minecraft.fandom.com/wiki/Anvil_mechanics#Enchantment_equation
// Calculate work penalty // Calculate work penalty
val leftPenalty = (left.itemMeta as? Repairable)?.repairCost ?: 0 val leftPenalty = (left.itemMeta as? Repairable)?.repairCost ?: 0
val rightPenalty = val rightPenalty =
if(right == null){ 0 } if (right == null) {
else{ (right.itemMeta as? Repairable)?.repairCost ?: 0 } 0
} else {
(right.itemMeta as? Repairable)?.repairCost ?: 0
}
// Try to set work penalty for the result item // Try to set work penalty for the result item
result.itemMeta?.let { result.itemMeta?.let {
(it as? Repairable)?.repairCost = leftPenalty*2+1 (it as? Repairable)?.repairCost = leftPenalty * 2 + 1
result.itemMeta = it result.itemMeta = it
} }
CustomAnvil.log("Calculated penalty: " + CustomAnvil.log(
"Calculated penalty: " +
"leftPenalty: $leftPenalty, " + "leftPenalty: $leftPenalty, " +
"rightPenalty: $rightPenalty, " + "rightPenalty: $rightPenalty, " +
"result penalty: ${(result.itemMeta as? Repairable)?.repairCost ?: "none"}") "result penalty: ${(result.itemMeta as? Repairable)?.repairCost ?: "none"}"
)
return leftPenalty + rightPenalty return leftPenalty + rightPenalty
} }
@ -312,7 +327,7 @@ class AnvilEventListener : Listener {
* Function to calculate right enchantment values * Function to calculate right enchantment values
* it include enchantment placed on final item and conflicting enchantment * it include enchantment placed on final item and conflicting enchantment
*/ */
private fun getRightValues(right: ItemStack, result:ItemStack) : Int { private fun getRightValues(right: ItemStack, result: ItemStack): Int {
// Calculate right value and illegal enchant penalty // Calculate right value and illegal enchant penalty
var illegalPenalty = 0 var illegalPenalty = 0
var rightValue = 0 var rightValue = 0
@ -323,12 +338,16 @@ class AnvilEventListener : Listener {
for (enchantment in right.findEnchantments()) { for (enchantment in right.findEnchantments()) {
// count enchant as illegal enchant if it conflicts with another enchant or not in result // count enchant as illegal enchant if it conflicts with another enchant or not in result
if((enchantment.key !in resultEnchsKeys)){ if ((enchantment.key !in resultEnchsKeys)) {
resultEnchsKeys.add(enchantment.key) resultEnchsKeys.add(enchantment.key)
val conflictType = ConfigHolder.CONFLICT_HOLDER.conflictManager.isConflicting(resultEnchsKeys,result.type,enchantment.key) val conflictType = ConfigHolder.CONFLICT_HOLDER.conflictManager.isConflicting(
resultEnchsKeys,
result.type,
enchantment.key
)
resultEnchsKeys.remove(enchantment.key) resultEnchsKeys.remove(enchantment.key)
if(ConflictType.BIG_CONFLICT == conflictType){ if (ConflictType.BIG_CONFLICT == conflictType) {
illegalPenalty += ConfigOptions.sacrificeIllegalCost illegalPenalty += ConfigOptions.sacrificeIllegalCost
} }
continue continue
@ -342,9 +361,11 @@ class AnvilEventListener : Listener {
rightValue += value rightValue += value
} }
CustomAnvil.log("Calculated right values: " + CustomAnvil.log(
"Calculated right values: " +
"rightValue: $rightValue, " + "rightValue: $rightValue, " +
"illegalPenalty: $illegalPenalty") "illegalPenalty: $illegalPenalty"
)
return rightValue + illegalPenalty return rightValue + illegalPenalty
} }
@ -352,15 +373,16 @@ class AnvilEventListener : Listener {
/** /**
* Display xp needed for the work on the anvil inventory * Display xp needed for the work on the anvil inventory
*/ */
private fun handleAnvilXp(inventory: AnvilInventory, private fun handleAnvilXp(
inventory: AnvilInventory,
event: PrepareAnvilEvent, event: PrepareAnvilEvent,
anvilCost: Int){ anvilCost: Int
) {
// Test repair cost limit // Test repair cost limit
val finalAnvilCost: Int val finalAnvilCost = if (ConfigOptions.limitRepairCost) {
if (ConfigOptions.limitRepairCost) { min(anvilCost, ConfigOptions.limitRepairValue)
finalAnvilCost = min(anvilCost, ConfigOptions.limitRepairValue) } else {
}else{ anvilCost
finalAnvilCost = anvilCost
} }
/* Because Minecraft likes to have the final say in the repair cost displayed /* Because Minecraft likes to have the final say in the repair cost displayed
@ -383,7 +405,7 @@ class AnvilEventListener : Listener {
private class SlotContainer(val type: SlotType, val slot: Int) private class SlotContainer(val type: SlotType, val slot: Int)
private enum class SlotType{ private enum class SlotType {
CURSOR, CURSOR,
INVENTORY, INVENTORY,
NO_SLOT NO_SLOT

27
src/main/kotlin/io/delilaheve/CustomAnvil.kt
View file

@ -24,17 +24,22 @@ class CustomAnvil : JavaPlugin() {
// Permission string required to use the plugin's features // Permission string required to use the plugin's features
const val affectedByPluginPermission = "ca.affected" const val affectedByPluginPermission = "ca.affected"
// Permission string required to bypass enchantment conflicts test // Permission string required to bypass enchantment conflicts test
const val bypassFusePermission = "ca.bypass.fuse" const val bypassFusePermission = "ca.bypass.fuse"
// Permission string required to bypass enchantment conflicts test // Permission string required to bypass enchantment conflicts test
const val bypassLevelPermission = "ca.bypass.level" const val bypassLevelPermission = "ca.bypass.level"
// Permission string required to reload the config // Permission string required to reload the config
const val commandReloadPermission = "ca.command.reload" const val commandReloadPermission = "ca.command.reload"
// Permission string required to edit the plugin's config // Permission string required to edit the plugin's config
const val editConfigPermission = "ca.config.edit" const val editConfigPermission = "ca.config.edit"
// Command Name to reload the config // Command Name to reload the config
const val commandReloadName = "anvilconfigreload" const val commandReloadName = "anvilconfigreload"
// Test command name // Test command name
const val commandTestName = "customanvilconfig" const val commandTestName = "customanvilconfig"
@ -71,7 +76,7 @@ class CustomAnvil : JavaPlugin() {
// Disable old plugin name if exist // Disable old plugin name if exist
val potentialPlugin = Bukkit.getPluginManager().getPlugin("UnsafeEnchantsPlus") val potentialPlugin = Bukkit.getPluginManager().getPlugin("UnsafeEnchantsPlus")
if(potentialPlugin != null){ if (potentialPlugin != null) {
Bukkit.getPluginManager().disablePlugin(potentialPlugin) Bukkit.getPluginManager().disablePlugin(potentialPlugin)
logger.warning("An old version of this plugin was detected") logger.warning("An old version of this plugin was detected")
logger.warning("Please note CustomAnvil is a more recent version of UnsafeEnchantsPlus") logger.warning("Please note CustomAnvil is a more recent version of UnsafeEnchantsPlus")
@ -83,7 +88,7 @@ class CustomAnvil : JavaPlugin() {
// Load config // Load config
val success = ConfigHolder.loadConfig() val success = ConfigHolder.loadConfig()
if(!success) return if (!success) return
// Load metrics // Load metrics
val metric = Metrics(this, bstatsPluginId) val metric = Metrics(this, bstatsPluginId)
@ -98,26 +103,28 @@ class CustomAnvil : JavaPlugin() {
) )
} }
fun reloadResource(resourceName: String, fun reloadResource(
hardFailSafe:Boolean = true): YamlConfiguration?{ resourceName: String,
hardFailSafe: Boolean = true
): YamlConfiguration? {
// Save default resource // Save default resource
val file = File(dataFolder,resourceName) val file = File(dataFolder, resourceName)
if(!file.exists()){ if (!file.exists()) {
saveResource(resourceName,false) saveResource(resourceName, false)
} }
// Load resource // Load resource
val yamlConfig = YamlConfiguration() val yamlConfig = YamlConfiguration()
try { try {
val configReader = FileReader(file) val configReader = FileReader(file)
yamlConfig.load(configReader) yamlConfig.load(configReader)
} catch (test: Exception){ } catch (test: Exception) {
if(hardFailSafe){ if (hardFailSafe) {
// This is important and may impact gameplay if it does not load. // This is important and may impact gameplay if it does not load.
// Failsafe is to stop the plugin // Failsafe is to stop the plugin
logger.severe("Resource $resourceName Could not be load or reload.") logger.severe("Resource $resourceName Could not be load or reload.")
logger.severe("Disabling plugin.") logger.severe("Disabling plugin.")
Bukkit.getPluginManager().disablePlugin(this) Bukkit.getPluginManager().disablePlugin(this)
}else{ } else {
logger.warning("Resource $resourceName Could not be load or reload.") logger.warning("Resource $resourceName Could not be load or reload.")
} }
return null return null

33
src/main/kotlin/io/delilaheve/util/ConfigOptions.kt
View file

@ -12,67 +12,94 @@ object ConfigOptions {
// Path for default enchantment limits // Path for default enchantment limits
private const val DEFAULT_LIMIT_PATH = "default_limit" private const val DEFAULT_LIMIT_PATH = "default_limit"
// Path for limiting repair cost // Path for limiting repair cost
const val LIMIT_REPAIR_COST = "limit_repair_cost" const val LIMIT_REPAIR_COST = "limit_repair_cost"
// Path for repair value limit // Path for repair value limit
const val LIMIT_REPAIR_VALUE = "limit_repair_value" const val LIMIT_REPAIR_VALUE = "limit_repair_value"
// Path for level cost on item repair // Path for level cost on item repair
const val ITEM_REPAIR_COST = "item_repair_cost" const val ITEM_REPAIR_COST = "item_repair_cost"
// Path for level cost on unit repair // Path for level cost on unit repair
const val UNIT_REPAIR_COST = "unit_repair_cost" const val UNIT_REPAIR_COST = "unit_repair_cost"
// Path for level cost on item renaming // Path for level cost on item renaming
const val ITEM_RENAME_COST = "item_rename_cost" const val ITEM_RENAME_COST = "item_rename_cost"
// Path for level cost on illegal enchantment on sacrifice // Path for level cost on illegal enchantment on sacrifice
const val SACRIFICE_ILLEGAL_COST = "sacrifice_illegal_enchant_cost" const val SACRIFICE_ILLEGAL_COST = "sacrifice_illegal_enchant_cost"
// Path for removing repair cost limits // Path for removing repair cost limits
const val REMOVE_REPAIR_LIMIT = "remove_repair_limit" const val REMOVE_REPAIR_LIMIT = "remove_repair_limit"
// Root path for enchantment limits // Root path for enchantment limits
const val ENCHANT_LIMIT_ROOT = "enchant_limits" const val ENCHANT_LIMIT_ROOT = "enchant_limits"
// Root path for enchantment values // Root path for enchantment values
const val ENCHANT_VALUES_ROOT = "enchant_values" const val ENCHANT_VALUES_ROOT = "enchant_values"
// Keys for specific enchantment values // Keys for specific enchantment values
private const val KEY_BOOK = "book" private const val KEY_BOOK = "book"
private const val KEY_ITEM = "item" private const val KEY_ITEM = "item"
// Debug logging toggle path // Debug logging toggle path
private const val DEBUG_LOGGING = "debug_log" private const val DEBUG_LOGGING = "debug_log"
// Debug verbose logging toggle path // Debug verbose logging toggle path
private const val VERBOSE_DEBUG_LOGGING = "debug_log_verbose" private const val VERBOSE_DEBUG_LOGGING = "debug_log_verbose"
// Default value for enchantment limits // Default value for enchantment limits
private const val DEFAULT_ENCHANT_LIMIT = 5 private const val DEFAULT_ENCHANT_LIMIT = 5
// Default value for limiting repair cost // Default value for limiting repair cost
const val DEFAULT_LIMIT_REPAIR = false const val DEFAULT_LIMIT_REPAIR = false
// Default value for repair cost limit // Default value for repair cost limit
const val DEFAULT_LIMIT_REPAIR_VALUE = 39 const val DEFAULT_LIMIT_REPAIR_VALUE = 39
// Default value for level cost on item repair // Default value for level cost on item repair
const val DEFAULT_ITEM_REPAIR_COST = 2 const val DEFAULT_ITEM_REPAIR_COST = 2
// Default value for level cost per unit repair // Default value for level cost per unit repair
const val DEFAULT_UNIT_REPAIR_COST = 1 const val DEFAULT_UNIT_REPAIR_COST = 1
// Default value for level cost on item renaming // Default value for level cost on item renaming
const val DEFAULT_ITEM_RENAME_COST = 1 const val DEFAULT_ITEM_RENAME_COST = 1
// Default value for level cost on illegal enchantment on sacrifice // Default value for level cost on illegal enchantment on sacrifice
const val DEFAULT_SACRIFICE_ILLEGAL_COST = 1 const val DEFAULT_SACRIFICE_ILLEGAL_COST = 1
// Valid range for repair cost limit // Valid range for repair cost limit
@JvmField @JvmField
val REPAIR_LIMIT_RANGE = 1..39 val REPAIR_LIMIT_RANGE = 1..39
// Valid range for repair cost // Valid range for repair cost
@JvmField @JvmField
val REPAIR_COST_RANGE = 0..255 val REPAIR_COST_RANGE = 0..255
// Valid range for rename cost // Valid range for rename cost
@JvmField @JvmField
val ITEM_RENAME_COST_RANGE = 0..255 val ITEM_RENAME_COST_RANGE = 0..255
// Valid range for illegal enchantment conflict cost // Valid range for illegal enchantment conflict cost
@JvmField @JvmField
val SACRIFICE_ILLEGAL_COST_RANGE = 0..255 val SACRIFICE_ILLEGAL_COST_RANGE = 0..255
// Default for removing repair cost limits // Default for removing repair cost limits
const val DEFAULT_REMOVE_LIMIT = false const val DEFAULT_REMOVE_LIMIT = false
// Valid range for an enchantment limit // Valid range for an enchantment limit
@JvmField @JvmField
val ENCHANT_LIMIT_RANGE = 1..255 val ENCHANT_LIMIT_RANGE = 1..255
// Default value for an enchantment multiplier // Default value for an enchantment multiplier
private const val DEFAULT_ENCHANT_VALUE = 0 private const val DEFAULT_ENCHANT_VALUE = 0
// Default value for debug logging // Default value for debug logging
private const val DEFAULT_DEBUG_LOG = false private const val DEFAULT_DEBUG_LOG = false
// Default value for debug logging // Default value for debug logging
private const val DEFAULT_VERBOSE_DEBUG_LOG = false private const val DEFAULT_VERBOSE_DEBUG_LOG = false
@ -155,6 +182,7 @@ object ConfigOptions {
.takeIf { it in SACRIFICE_ILLEGAL_COST_RANGE } .takeIf { it in SACRIFICE_ILLEGAL_COST_RANGE }
?: DEFAULT_SACRIFICE_ILLEGAL_COST ?: DEFAULT_SACRIFICE_ILLEGAL_COST
} }
/** /**
* Whether to remove repair cost limit * Whether to remove repair cost limit
*/ */
@ -217,8 +245,9 @@ object ConfigOptions {
/** /**
* Get an array of key of basic config options * Get an array of key of basic config options
*/ */
fun getBasicConfigKeys(): Array<String>{ fun getBasicConfigKeys(): Array<String> {
return arrayOf(DEFAULT_LIMIT_PATH, return arrayOf(
DEFAULT_LIMIT_PATH,
LIMIT_REPAIR_COST, LIMIT_REPAIR_COST,
LIMIT_REPAIR_VALUE, LIMIT_REPAIR_VALUE,
ITEM_REPAIR_COST, ITEM_REPAIR_COST,

34
src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt
View file

@ -34,43 +34,51 @@ object EnchantmentUtil {
if (!containsKey(enchantment)) { if (!containsKey(enchantment)) {
// Add the enchantment if it doesn't have conflicts, or if player is allowed to bypass enchantment restrictions // Add the enchantment if it doesn't have conflicts, or if player is allowed to bypass enchantment restrictions
this[enchantment] = level this[enchantment] = level
val conflictType = ConfigHolder.CONFLICT_HOLDER.conflictManager.isConflicting(this.keys,mat,enchantment); val conflictType =
if(!player.hasPermission(CustomAnvil.bypassFusePermission) && ConfigHolder.CONFLICT_HOLDER.conflictManager.isConflicting(this.keys, mat, enchantment)
(conflictType != ConflictType.NO_CONFLICT)){ if (!player.hasPermission(CustomAnvil.bypassFusePermission) &&
(conflictType != ConflictType.NO_CONFLICT)
) {
CustomAnvil.verboseLog("Enchantment not yet in result list, but there is conflict (${enchantment.key}, conflict: $conflictType)") CustomAnvil.verboseLog("Enchantment not yet in result list, but there is conflict (${enchantment.key}, conflict: $conflictType)")
this.remove(enchantment) this.remove(enchantment)
} }
} }
// Enchantment already in result list // Enchantment already in result list
else{ else {
// ... and they are conflicting // ... and they are conflicting
val conflictType = ConfigHolder.CONFLICT_HOLDER.conflictManager.isConflicting(this.keys,mat,enchantment) val conflictType =
if((conflictType != ConflictType.NO_CONFLICT) ConfigHolder.CONFLICT_HOLDER.conflictManager.isConflicting(this.keys, mat, enchantment)
&& !player.hasPermission(CustomAnvil.bypassFusePermission)){ if ((conflictType != ConflictType.NO_CONFLICT)
&& !player.hasPermission(CustomAnvil.bypassFusePermission)
) {
CustomAnvil.verboseLog("Enchantment already in result list, and they are conflicting (${enchantment.key}, conflict: $conflictType)") CustomAnvil.verboseLog("Enchantment already in result list, and they are conflicting (${enchantment.key}, conflict: $conflictType)")
return@forEach return@forEach
} }
// ... and they're not the same level // ... and they're not the same level
if(this[enchantment] != other[enchantment]){ if (this[enchantment] != other[enchantment]) {
val newLevel = max(this[enchantment] ?: 0, other[enchantment] ?: 0) val newLevel = max(this[enchantment] ?: 0, other[enchantment] ?: 0)
// apply the greater of the two if non-zero // apply the greater of the two if non-zero
if (newLevel > 0) { this[enchantment] = newLevel } if (newLevel > 0) {
this[enchantment] = newLevel
}
} }
// ... and they're the same level // ... and they're the same level
else { else {
// try to increase the enchantment level by 1 // try to increase the enchantment level by 1
var newLevel = this[enchantment]!! +1 var newLevel = this[enchantment]!! + 1
// Get max level or 255 if player can bypass // Get max level or 255 if player can bypass
val maxLevel = if(player.hasPermission(CustomAnvil.bypassLevelPermission)){ val maxLevel = if (player.hasPermission(CustomAnvil.bypassLevelPermission)) {
255 255
}else{ } else {
ConfigOptions.enchantLimit(enchantment) ConfigOptions.enchantLimit(enchantment)
} }
newLevel = min(newLevel, maxLevel) newLevel = min(newLevel, maxLevel)
if (newLevel > 0) { this[enchantment] = newLevel } if (newLevel > 0) {
this[enchantment] = newLevel
}
} }
} }
} }

8
src/main/kotlin/io/delilaheve/util/ItemUtil.kt
View file

@ -75,7 +75,7 @@ object ItemUtil {
(itemMeta as? Damageable)?.let { (itemMeta as? Damageable)?.let {
val durability = type.maxDurability.toInt() val durability = type.maxDurability.toInt()
val firstDamage = (first.itemMeta as? Damageable)?.damage ?: 0 val firstDamage = (first.itemMeta as? Damageable)?.damage ?: 0
if( firstDamage == 0) return false if (firstDamage == 0) return false
val firstDurability = durability - firstDamage val firstDurability = durability - firstDamage
val secondDamage = (second.itemMeta as? Damageable)?.damage ?: 0 val secondDamage = (second.itemMeta as? Damageable)?.damage ?: 0
@ -96,12 +96,12 @@ object ItemUtil {
(itemMeta as? Damageable)?.let { (itemMeta as? Damageable)?.let {
val durability = type.maxDurability.toInt() val durability = type.maxDurability.toInt()
val firstDamage = it.damage val firstDamage = it.damage
if( firstDamage == 0) return 0 if (firstDamage == 0) return 0
var unitCount = 0 var unitCount = 0
var damage = firstDamage var damage = firstDamage
while((unitCount < unitAmount) && (damage > 0)){ while ((unitCount < unitAmount) && (damage > 0)) {
unitCount++ unitCount++
damage = ceil(firstDamage - durability*percentPerUnit*unitCount).toInt() damage = ceil(firstDamage - durability * percentPerUnit * unitCount).toInt()
} }
it.damage = max(damage, 0) it.damage = max(damage, 0)

4
src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt
View file

@ -11,11 +11,11 @@ import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions
class EditConfigExecutor : CommandExecutor { class EditConfigExecutor : CommandExecutor {
override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean { override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
if(!sender.hasPermission(CustomAnvil.editConfigPermission)) { if (!sender.hasPermission(CustomAnvil.editConfigPermission)) {
sender.sendMessage(GuiGlobalActions.NO_EDIT_PERM) sender.sendMessage(GuiGlobalActions.NO_EDIT_PERM)
return false return false
} }
if(sender !is HumanEntity) return false if (sender !is HumanEntity) return false
MainConfigGui.INSTANCE.show(sender) MainConfigGui.INSTANCE.show(sender)
return true return true

16
src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt
View file

@ -13,18 +13,18 @@ import xyz.alexcrea.cuanvil.util.MetricsUtil
class ReloadExecutor : CommandExecutor { class ReloadExecutor : CommandExecutor {
override fun onCommand(sender: CommandSender, cmd: Command, cmdstr: String, args: Array<out String>): Boolean { override fun onCommand(sender: CommandSender, cmd: Command, cmdstr: String, args: Array<out String>): Boolean {
if(!sender.hasPermission(CustomAnvil.commandReloadPermission)) { if (!sender.hasPermission(CustomAnvil.commandReloadPermission)) {
sender.sendMessage("§cYou do not have permission to reload the config") sender.sendMessage("§cYou do not have permission to reload the config")
return false return false
} }
sender.sendMessage("§eReloading config...") sender.sendMessage("§eReloading config...")
val hardfail = args.isNotEmpty() && ("hard".equals(args[0],true)) val hardfail = args.isNotEmpty() && ("hard".equals(args[0], true))
val commandSuccess = commandBody(hardfail) val commandSuccess = commandBody(hardfail)
if(commandSuccess){ if (commandSuccess) {
sender.sendMessage("§aConfig reloaded !") sender.sendMessage("§aConfig reloaded !")
}else{ } else {
sender.sendMessage("§cConfig was not able to be reloaded...") sender.sendMessage("§cConfig was not able to be reloaded...")
if(hardfail){ if (hardfail) {
sender.sendMessage("§4Hard fail, plugin disabled") sender.sendMessage("§4Hard fail, plugin disabled")
} }
} }
@ -34,9 +34,9 @@ class ReloadExecutor : CommandExecutor {
/** /**
* Execute the command, return true if success or false otherwise * Execute the command, return true if success or false otherwise
*/ */
private fun commandBody(hardfail: Boolean): Boolean{ private fun commandBody(hardfail: Boolean): Boolean {
try { try {
if(!ConfigHolder.reloadAllFromDisk(hardfail)) return false if (!ConfigHolder.reloadAllFromDisk(hardfail)) return false
// Then update all global gui containing value from config // Then update all global gui containing value from config
BasicConfigGui.INSTANCE.updateGuiValues() BasicConfigGui.INSTANCE.updateGuiValues()
@ -48,7 +48,7 @@ class ReloadExecutor : CommandExecutor {
MetricsUtil.testIfConfigIsDefault() MetricsUtil.testIfConfigIsDefault()
return true return true
}catch (e: Exception){ } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
return false return false
} }

21
src/main/kotlin/xyz/alexcrea/cuanvil/group/AbstractMaterialGroup.kt
View file

@ -4,7 +4,7 @@ import org.bukkit.Material
import java.util.* import java.util.*
abstract class AbstractMaterialGroup(private val name: String) { abstract class AbstractMaterialGroup(private val name: String) {
protected val includedMaterial by lazy {createDefaultSet()} protected val includedMaterial by lazy { createDefaultSet() }
/** /**
* Get the group default set * Get the group default set
@ -14,24 +14,24 @@ abstract class AbstractMaterialGroup(private val name: String) {
/** /**
* Get if a material is allowed following the group policy * Get if a material is allowed following the group policy
*/ */
open fun contain(mat : Material): Boolean { open fun contain(mat: Material): Boolean {
return mat in getMaterials() return mat in getMaterials()
} }
/** /**
* Get if a group is referenced by this: * Get if a group is referenced by this:
*/ */
abstract fun isReferencing(other : AbstractMaterialGroup): Boolean abstract fun isReferencing(other: AbstractMaterialGroup): Boolean
/** /**
* Push a material to this group to follow this group policy * Push a material to this group to follow this group policy
*/ */
abstract fun addToPolicy(mat : Material) abstract fun addToPolicy(mat: Material)
/** /**
* Push a group to this group to follow this group policy * Push a group to this group to follow this group policy
*/ */
abstract fun addToPolicy(other : AbstractMaterialGroup) abstract fun addToPolicy(other: AbstractMaterialGroup)
/** /**
* Get the group contained material as a set * Get the group contained material as a set
@ -44,6 +44,7 @@ abstract class AbstractMaterialGroup(private val name: String) {
open fun getNonGroupInheritedMaterials(): EnumSet<Material> { open fun getNonGroupInheritedMaterials(): EnumSet<Material> {
return includedMaterial return includedMaterial
} }
/** /**
* Get the group non-inherited material as a set * Get the group non-inherited material as a set
*/ */
@ -69,19 +70,19 @@ abstract class AbstractMaterialGroup(private val name: String) {
*/ */
abstract fun getGroups(): MutableSet<AbstractMaterialGroup> abstract fun getGroups(): MutableSet<AbstractMaterialGroup>
open fun getRepresentativeMaterial() : Material { open fun getRepresentativeMaterial(): Material {
// Test inner material // Test inner material
val matIterator = includedMaterial.iterator() val matIterator = includedMaterial.iterator()
while(matIterator.hasNext()){ while (matIterator.hasNext()) {
val material = matIterator.next() val material = matIterator.next()
if(material.isAir) continue if (material.isAir) continue
return material return material
} }
// Test included group representative material // Test included group representative material
val groupIterator = getGroups().iterator() val groupIterator = getGroups().iterator()
while (groupIterator.hasNext()){ while (groupIterator.hasNext()) {
val groupMat = groupIterator.next().getRepresentativeMaterial() val groupMat = groupIterator.next().getRepresentativeMaterial()
if(groupMat.isAir) continue if (groupMat.isAir) continue
return groupMat return groupMat
} }
return Material.PAPER return Material.PAPER

23
src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt
View file

@ -7,29 +7,30 @@ import org.bukkit.enchantments.Enchantment
class EnchantConflictGroup( class EnchantConflictGroup(
val name: String, val name: String,
private val cantConflict: AbstractMaterialGroup, private val cantConflict: AbstractMaterialGroup,
val minBeforeBlock: Int){ val minBeforeBlock: Int
) {
private val enchantments = HashSet<Enchantment>() private val enchantments = HashSet<Enchantment>()
fun addEnchantment(enchant: Enchantment){ fun addEnchantment(enchant: Enchantment) {
enchantments.add(enchant) enchantments.add(enchant)
} }
fun allowed(enchants: Set<Enchantment>, mat: Material) : Boolean{ fun allowed(enchants: Set<Enchantment>, mat: Material): Boolean {
if(enchantments.size < minBeforeBlock){ if (enchantments.size < minBeforeBlock) {
return true return true
} }
if(cantConflict.contain(mat)){ if (cantConflict.contain(mat)) {
return true return true
} }
// Count the amount of enchantment that are in the list // Count the amount of enchantment that are in the list
var enchantAmount = 0 var enchantAmount = 0
for (enchantment in enchants) { for (enchantment in enchants) {
if(enchantment !in enchantments) continue if (enchantment !in enchantments) continue
CustomAnvil.verboseLog("Enchant ${enchantment.key} is in: ${enchantAmount + 1}/$minBeforeBlock ") CustomAnvil.verboseLog("Enchant ${enchantment.key} is in: ${enchantAmount + 1}/$minBeforeBlock ")
if(++enchantAmount > minBeforeBlock){ if (++enchantAmount > minBeforeBlock) {
return false return false
} }
@ -37,8 +38,8 @@ class EnchantConflictGroup(
return true return true
} }
fun getCantConflictGroup(): AbstractMaterialGroup{ fun getCantConflictGroup(): AbstractMaterialGroup {
return this.cantConflict; return this.cantConflict
} }
fun getEnchants(): HashSet<Enchantment> { fun getEnchants(): HashSet<Enchantment> {
@ -53,9 +54,9 @@ class EnchantConflictGroup(
fun getRepresentativeMaterial(): Material { fun getRepresentativeMaterial(): Material {
val groups = getCantConflictGroup().getGroups() val groups = getCantConflictGroup().getGroups()
val groupIterator = groups.iterator() val groupIterator = groups.iterator()
while (groupIterator.hasNext()){ while (groupIterator.hasNext()) {
val mat = groupIterator.next().getRepresentativeMaterial() val mat = groupIterator.next().getRepresentativeMaterial()
if(mat != Material.ENCHANTED_BOOK) return mat if (mat != Material.ENCHANTED_BOOK) return mat
} }
return Material.ENCHANTED_BOOK return Material.ENCHANTED_BOOK

72
src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt
View file

@ -11,13 +11,17 @@ class EnchantConflictManager {
companion object { companion object {
// Path for the enchantments list // Path for the enchantments list
const val ENCH_LIST_PATH = "enchantments" const val ENCH_LIST_PATH = "enchantments"
// Path for group list related to the conflict // Path for group list related to the conflict
const val CONFLICT_GROUP_PATH = "notAffectedGroups" const val CONFLICT_GROUP_PATH = "notAffectedGroups"
// Path for the maximum number of enchantment before validating the conflict // Path for the maximum number of enchantment before validating the conflict
const val ENCH_MAX_PATH = "maxEnchantmentBeforeConflict" const val ENCH_MAX_PATH = "maxEnchantmentBeforeConflict"
// Path for a flag: if the enchantment will be used in the last supported version // Path for a flag: if the enchantment will be used in the last supported version
// TODO maybe replace this system by a list of "future" enchantment. // TODO maybe replace this system by a list of "future" enchantment.
private const val FUTURE_USE_PATH = "useInFuture" private const val FUTURE_USE_PATH = "useInFuture"
// Default name for a joining group // Default name for a joining group
private const val DEFAULT_GROUP_NAME = "joinedGroup" private const val DEFAULT_GROUP_NAME = "joinedGroup"
} }
@ -26,64 +30,64 @@ class EnchantConflictManager {
lateinit var conflictList: ArrayList<EnchantConflictGroup> lateinit var conflictList: ArrayList<EnchantConflictGroup>
// Read and prepare all conflict // Read and prepare all conflict
fun prepareConflicts(config: ConfigurationSection, itemManager: ItemGroupManager){ fun prepareConflicts(config: ConfigurationSection, itemManager: ItemGroupManager) {
conflictMap = HashMap() conflictMap = HashMap()
conflictList = ArrayList() conflictList = ArrayList()
val keys = config.getKeys(false) val keys = config.getKeys(false)
for (key in keys) { for (key in keys) {
val section = config.getConfigurationSection(key)!! val section = config.getConfigurationSection(key)!!
val conflict = createConflict(section,itemManager,key) val conflict = createConflict(section, itemManager, key)
if(conflict != null){
addToMap(conflict) addToMap(conflict)
conflictList.add(conflict) conflictList.add(conflict)
} }
} }
}
// Add the conflict to the map // Add the conflict to the map
private fun addToMap(conflict: EnchantConflictGroup){ private fun addToMap(conflict: EnchantConflictGroup) {
conflict.getEnchants().forEach{ enchant -> conflict.getEnchants().forEach { enchant ->
addConflictToConflictMap(enchant, conflict); addConflictToConflictMap(enchant, conflict)
} }
} }
fun addConflictToConflictMap(enchant: Enchantment, conflict: EnchantConflictGroup){ fun addConflictToConflictMap(enchant: Enchantment, conflict: EnchantConflictGroup) {
if(!conflictMap.containsKey(enchant)){ if (!conflictMap.containsKey(enchant)) {
conflictMap[enchant] = ArrayList() conflictMap[enchant] = ArrayList()
} }
conflictMap[enchant]!!.add(conflict) conflictMap[enchant]!!.add(conflict)
} }
fun removeConflictFromMap(enchant: Enchantment, conflict: EnchantConflictGroup): Boolean{ fun removeConflictFromMap(enchant: Enchantment, conflict: EnchantConflictGroup): Boolean {
return conflictMap[enchant]!!.remove(conflict) return conflictMap[enchant]!!.remove(conflict)
} }
// create and read a conflict from a yaml section // create and read a conflict from a yaml section
private fun createConflict(section: ConfigurationSection, private fun createConflict(
section: ConfigurationSection,
itemManager: ItemGroupManager, itemManager: ItemGroupManager,
conflictName: String): EnchantConflictGroup? { conflictName: String
): EnchantConflictGroup {
// Is it planed for the future // Is it planed for the future
val futureUse = section.getBoolean(FUTURE_USE_PATH,false) val futureUse = section.getBoolean(FUTURE_USE_PATH, false)
// Create conflict // Create conflict
val conflict = createConflictObject(section,itemManager,conflictName) val conflict = createConflictObject(section, itemManager, conflictName)
// Read and add enchantment to conflict // Read and add enchantment to conflict
val enchantList = section.getStringList(ENCH_LIST_PATH) val enchantList = section.getStringList(ENCH_LIST_PATH)
for (enchantName in enchantList) { for (enchantName in enchantList) {
val enchantKey = NamespacedKey.minecraft(enchantName) val enchantKey = NamespacedKey.minecraft(enchantName)
val enchant = Enchantment.getByKey(enchantKey) val enchant = Enchantment.getByKey(enchantKey)
if(enchant == null){ if (enchant == null) {
if(!futureUse){ if (!futureUse) {
CustomAnvil.instance.logger.warning("Enchantment $enchantName do not exist but was asked for conflict $conflictName") CustomAnvil.instance.logger.warning("Enchantment $enchantName do not exist but was asked for conflict $conflictName")
} }
continue continue
} }
conflict.addEnchantment(enchant) conflict.addEnchantment(enchant)
} }
if(conflict.getEnchants().size == 0){ if (conflict.getEnchants().size == 0) {
if(!futureUse){ if (!futureUse) {
CustomAnvil.instance.logger.warning("Conflict $conflictName do not have valid enchantment, it will not do anything") CustomAnvil.instance.logger.warning("Conflict $conflictName do not have valid enchantment, it will not do anything")
} }
} }
@ -91,12 +95,14 @@ class EnchantConflictManager {
return conflict return conflict
} }
private fun createConflictObject(section: ConfigurationSection, private fun createConflictObject(
section: ConfigurationSection,
itemManager: ItemGroupManager, itemManager: ItemGroupManager,
conflictName: String): EnchantConflictGroup { conflictName: String
): EnchantConflictGroup {
// Get the maximum number of enchantment before validating the conflict // Get the maximum number of enchantment before validating the conflict
var minBeforeBlock = section.getInt(ENCH_MAX_PATH,0) var minBeforeBlock = section.getInt(ENCH_MAX_PATH, 0)
if(minBeforeBlock < 0){ if (minBeforeBlock < 0) {
minBeforeBlock = 0 minBeforeBlock = 0
CustomAnvil.instance.logger.warning("Conflict $conflictName have an invalid value of $ENCH_MAX_PATH") CustomAnvil.instance.logger.warning("Conflict $conflictName have an invalid value of $ENCH_MAX_PATH")
CustomAnvil.instance.logger.warning("It should be more or equal to 0. default to 0") CustomAnvil.instance.logger.warning("It should be more or equal to 0. default to 0")
@ -112,9 +118,13 @@ class EnchantConflictManager {
return EnchantConflictGroup(conflictName, finalGroup, minBeforeBlock) return EnchantConflictGroup(conflictName, finalGroup, minBeforeBlock)
} }
private fun findGroup(groupName: String, itemManager: ItemGroupManager, conflictName: String): AbstractMaterialGroup { private fun findGroup(
groupName: String,
itemManager: ItemGroupManager,
conflictName: String
): AbstractMaterialGroup {
val group = itemManager.get(groupName) val group = itemManager.get(groupName)
if(group == null){ if (group == null) {
CustomAnvil.instance.logger.warning("Group $groupName do not exist but is ask by conflict $conflictName") CustomAnvil.instance.logger.warning("Group $groupName do not exist but is ask by conflict $conflictName")
return IncludeGroup("error_placeholder") return IncludeGroup("error_placeholder")
} }
@ -122,7 +132,7 @@ class EnchantConflictManager {
return group return group
} }
fun isConflicting(base: Set<Enchantment>,mat: Material, newEnchant: Enchantment): ConflictType { fun isConflicting(base: Set<Enchantment>, mat: Material, newEnchant: Enchantment): ConflictType {
CustomAnvil.verboseLog("Testing conflict for ${newEnchant.key} on ${mat.key}") CustomAnvil.verboseLog("Testing conflict for ${newEnchant.key} on ${mat.key}")
val conflictList = conflictMap[newEnchant] ?: return ConflictType.NO_CONFLICT val conflictList = conflictMap[newEnchant] ?: return ConflictType.NO_CONFLICT
CustomAnvil.verboseLog("Did not get skipped") CustomAnvil.verboseLog("Did not get skipped")
@ -130,13 +140,13 @@ class EnchantConflictManager {
var result = ConflictType.NO_CONFLICT var result = ConflictType.NO_CONFLICT
for (conflict in conflictList) { for (conflict in conflictList) {
CustomAnvil.verboseLog("Is against ${conflict.name}") CustomAnvil.verboseLog("Is against ${conflict.name}")
val conflicting = conflict.allowed(base,mat) val conflicting = conflict.allowed(base, mat)
CustomAnvil.verboseLog("Was against ${conflict.name} and conflicting: $conflicting ") CustomAnvil.verboseLog("Was against ${conflict.name} and conflicting: $conflicting ")
if(!conflicting) { if (!conflicting) {
if(conflict.getEnchants().size <= 1){ if (conflict.getEnchants().size <= 1) {
result = ConflictType.SMALL_CONFLICT result = ConflictType.SMALL_CONFLICT
CustomAnvil.verboseLog("Small conflict, continuing") CustomAnvil.verboseLog("Small conflict, continuing")
}else{ } else {
return ConflictType.BIG_CONFLICT return ConflictType.BIG_CONFLICT
} }
} }
@ -146,7 +156,7 @@ class EnchantConflictManager {
} }
enum class ConflictType{ enum class ConflictType {
NO_CONFLICT, NO_CONFLICT,
SMALL_CONFLICT, SMALL_CONFLICT,
BIG_CONFLICT BIG_CONFLICT

8
src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt
View file

@ -3,17 +3,17 @@ package xyz.alexcrea.cuanvil.group
import org.bukkit.Material import org.bukkit.Material
import java.util.* import java.util.*
class ExcludeGroup(name: String): AbstractMaterialGroup(name) { class ExcludeGroup(name: String) : AbstractMaterialGroup(name) {
override fun createDefaultSet(): EnumSet<Material> { override fun createDefaultSet(): EnumSet<Material> {
return EnumSet.allOf(Material::class.java) return EnumSet.allOf(Material::class.java)
} }
private var includedGroup: MutableSet<AbstractMaterialGroup> = HashSet() private var includedGroup: MutableSet<AbstractMaterialGroup> = HashSet()
private val groupItems by lazy {createDefaultSet()} private val groupItems by lazy { createDefaultSet() }
override fun isReferencing(other: AbstractMaterialGroup): Boolean { override fun isReferencing(other: AbstractMaterialGroup): Boolean {
for (materialGroup in includedGroup.iterator()) { for (materialGroup in includedGroup.iterator()) {
if((materialGroup == other) || (materialGroup.isReferencing(other))){ if ((materialGroup == other) || (materialGroup.isReferencing(other))) {
return true return true
} }
} }
@ -36,7 +36,7 @@ class ExcludeGroup(name: String): AbstractMaterialGroup(name) {
includedGroup.clear() includedGroup.clear()
groups.forEach { group -> groups.forEach { group ->
if(!group.isReferencing(this)) { if (!group.isReferencing(this)) {
includedGroup.add(group) includedGroup.add(group)
groupItems.removeAll(group.getMaterials()) groupItems.removeAll(group.getMaterials())
} }

8
src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt
View file

@ -3,17 +3,17 @@ package xyz.alexcrea.cuanvil.group
import org.bukkit.Material import org.bukkit.Material
import java.util.* import java.util.*
class IncludeGroup(name: String): AbstractMaterialGroup(name) { class IncludeGroup(name: String) : AbstractMaterialGroup(name) {
override fun createDefaultSet(): EnumSet<Material> { override fun createDefaultSet(): EnumSet<Material> {
return EnumSet.noneOf(Material::class.java) return EnumSet.noneOf(Material::class.java)
} }
private var includedGroup: MutableSet<AbstractMaterialGroup> = HashSet() private var includedGroup: MutableSet<AbstractMaterialGroup> = HashSet()
private val groupItems by lazy {createDefaultSet()} private val groupItems by lazy { createDefaultSet() }
override fun isReferencing(other: AbstractMaterialGroup): Boolean { override fun isReferencing(other: AbstractMaterialGroup): Boolean {
for (materialGroup in includedGroup.iterator()) { for (materialGroup in includedGroup.iterator()) {
if((materialGroup == other) || (materialGroup.isReferencing(other))){ if ((materialGroup == other) || (materialGroup.isReferencing(other))) {
return true return true
} }
} }
@ -36,7 +36,7 @@ class IncludeGroup(name: String): AbstractMaterialGroup(name) {
includedGroup.clear() includedGroup.clear()
groups.forEach { group -> groups.forEach { group ->
if(!group.isReferencing(this)){ if (!group.isReferencing(this)) {
includedGroup.add(group) includedGroup.add(group)
groupItems.addAll(group.getMaterials()) groupItems.addAll(group.getMaterials())
} }

62
src/main/kotlin/xyz/alexcrea/cuanvil/group/ItemGroupManager.kt
View file

@ -4,49 +4,53 @@ import io.delilaheve.CustomAnvil
import org.bukkit.Material import org.bukkit.Material
import org.bukkit.configuration.ConfigurationSection import org.bukkit.configuration.ConfigurationSection
import java.util.* import java.util.*
import kotlin.collections.LinkedHashMap
class ItemGroupManager { class ItemGroupManager {
companion object { companion object {
// Path for group type // Path for group type
private const val GROUP_TYPE_PATH = "type" private const val GROUP_TYPE_PATH = "type"
// Path for included items list // Path for included items list
private const val MATERIAL_LIST_PATH = "items" private const val MATERIAL_LIST_PATH = "items"
// Path for included groups list // Path for included groups list
private const val GROUP_LIST_PATH = "groups" private const val GROUP_LIST_PATH = "groups"
// Temporary list of elements in default config that are use in future // Temporary list of elements in default config that are use in future
private val FUTURE_MATERIAL = setOf("PIGLIN_HEAD","BRUSH") private val FUTURE_MATERIAL = setOf("PIGLIN_HEAD", "BRUSH")
} }
lateinit var groupMap : LinkedHashMap<String, AbstractMaterialGroup> lateinit var groupMap: LinkedHashMap<String, AbstractMaterialGroup>
// Read and create material groups // Read and create material groups
fun prepareGroups(config: ConfigurationSection){ fun prepareGroups(config: ConfigurationSection) {
groupMap = LinkedHashMap() groupMap = LinkedHashMap()
val keys = config.getKeys(false) val keys = config.getKeys(false)
for (key in keys) { for (key in keys) {
if(groupMap.containsKey(key)) if (groupMap.containsKey(key))
continue continue
createGroup(config, keys, key) createGroup(config, keys, key)
} }
} }
// Create group by key // Create group by key
private fun createGroup(config: ConfigurationSection, private fun createGroup(
config: ConfigurationSection,
keys: Set<String>, keys: Set<String>,
key: String): AbstractMaterialGroup { key: String
): AbstractMaterialGroup {
val groupSection = config.getConfigurationSection(key)!! val groupSection = config.getConfigurationSection(key)!!
val groupType = groupSection.getString(GROUP_TYPE_PATH,null) val groupType = groupSection.getString(GROUP_TYPE_PATH, null)
// Create Material group according to the group type // Create Material group according to the group type
val group: AbstractMaterialGroup val group: AbstractMaterialGroup
if(GroupType.EXCLUDE.equal(groupType)){ if (GroupType.EXCLUDE.equal(groupType)) {
group = ExcludeGroup(key) group = ExcludeGroup(key)
}else { } else {
group = IncludeGroup(key) group = IncludeGroup(key)
if(!GroupType.INCLUDE.equal(groupType)){ if (!GroupType.INCLUDE.equal(groupType)) {
CustomAnvil.instance.logger.warning("Group $key have an invalid group type. default to Include.") CustomAnvil.instance.logger.warning("Group $key have an invalid group type. default to Include.")
} }
} }
@ -57,20 +61,23 @@ class ItemGroupManager {
} }
// Read Group elements // Read Group elements
private fun readGroup(group: AbstractMaterialGroup, private fun readGroup(
group: AbstractMaterialGroup,
groupSection: ConfigurationSection, groupSection: ConfigurationSection,
config: ConfigurationSection, config: ConfigurationSection,
keys: Set<String>){ keys: Set<String>
) {
// Read material to include in this group policy // Read material to include in this group policy
val materialList = groupSection.getStringList(MATERIAL_LIST_PATH) val materialList = groupSection.getStringList(MATERIAL_LIST_PATH)
for (materialTemp in materialList) { for (materialTemp in materialList) {
val materialName = materialTemp.uppercase(Locale.getDefault()) val materialName = materialTemp.uppercase(Locale.getDefault())
val material = Material.getMaterial(materialName) val material = Material.getMaterial(materialName)
if(material == null){ if (material == null) {
// Check if we should warn the user // Check if we should warn the user
if(materialName !in FUTURE_MATERIAL){ if (materialName !in FUTURE_MATERIAL) {
CustomAnvil.instance.logger.warning( CustomAnvil.instance.logger.warning(
"Unknown material $materialTemp on group ${group.getName()}") "Unknown material $materialTemp on group ${group.getName()}"
)
} }
continue continue
@ -82,23 +89,26 @@ class ItemGroupManager {
// please note the group name is case-sensitive. // please note the group name is case-sensitive.
val groupList = groupSection.getStringList(GROUP_LIST_PATH) val groupList = groupSection.getStringList(GROUP_LIST_PATH)
for (groupName in groupList) { for (groupName in groupList) {
if(groupName !in keys){ if (groupName !in keys) {
CustomAnvil.instance.logger.warning( CustomAnvil.instance.logger.warning(
"Group $groupName do not exist but is included in group ${group.getName()}") "Group $groupName do not exist but is included in group ${group.getName()}"
)
continue continue
} }
// Get other group or create it if not yet created // Get other group or create it if not yet created
val otherGroup = if(!groupMap.containsKey(groupName)){ val otherGroup = if (!groupMap.containsKey(groupName)) {
createGroup(config,keys,groupName) createGroup(config, keys, groupName)
}else{ } else {
groupMap[groupName]!! groupMap[groupName]!!
} }
// Avoid self reference or it will create an infinite loop // Avoid self reference or it will create an infinite loop
if(otherGroup.isReferencing(group)){ if (otherGroup.isReferencing(group)) {
CustomAnvil.instance.logger.warning( CustomAnvil.instance.logger.warning(
"Group $groupName is on a reference loop with group ${group.getName()} !") "Group $groupName is on a reference loop with group ${group.getName()} !"
)
CustomAnvil.instance.logger.warning( CustomAnvil.instance.logger.warning(
"Please fix it in your item_groups config or the plugin will probably not work as expected.") "Please fix it in your item_groups config or the plugin will probably not work as expected."
)
continue continue
} }
@ -121,8 +131,8 @@ enum class GroupType(private val groupID: String) {
; ;
// Test if string is equal to the groupID of this enum // Test if string is equal to the groupID of this enum
fun equal(toTest: String?): Boolean{ fun equal(toTest: String?): Boolean {
if(toTest == null) if (toTest == null)
return false return false
return groupID.contentEquals(toTest.lowercase(Locale.getDefault())) return groupID.contentEquals(toTest.lowercase(Locale.getDefault()))
} }

2
src/main/kotlin/xyz/alexcrea/cuanvil/listener/ChatEventListener.kt
View file

@ -11,7 +11,7 @@ import java.util.*
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import java.util.function.Consumer import java.util.function.Consumer
class ChatEventListener : Listener{ class ChatEventListener : Listener {
private val playerListenMap: ConcurrentHashMap<UUID, Consumer<String?>> = ConcurrentHashMap() private val playerListenMap: ConcurrentHashMap<UUID, Consumer<String?>> = ConcurrentHashMap()

71
src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt
View file

@ -31,12 +31,11 @@ object MetricsUtil {
*/ */
private fun getHashFromKey(section: ConfigurationSection, key: String): Int { private fun getHashFromKey(section: ConfigurationSection, key: String): Int {
// Key is assumend to exist // Key is assumend to exist
val resultHash: Int val resultHash = if (section.isConfigurationSection(key)) {
if(section.isConfigurationSection(key)){
val sectionResult = getConfigurationHash(section.getConfigurationSection(key)!!) val sectionResult = getConfigurationHash(section.getConfigurationSection(key)!!)
resultHash = key.hashCode() xor sectionResult key.hashCode() xor sectionResult
}else{ } else {
resultHash = key.hashCode() xor section.getString(key).hashCode() key.hashCode() xor section.getString(key).hashCode()
} }
return resultHash.hashCode() return resultHash.hashCode()
} }
@ -47,7 +46,7 @@ object MetricsUtil {
private fun getConfigurationHash(section: ConfigurationSection): Int { private fun getConfigurationHash(section: ConfigurationSection): Int {
var resultHash = 0 var resultHash = 0
for (key in section.getKeys(false)) { for (key in section.getKeys(false)) {
resultHash = resultHash xor getHashFromKey(section,key) resultHash = resultHash xor getHashFromKey(section, key)
} }
return resultHash return resultHash
} }
@ -55,10 +54,10 @@ object MetricsUtil {
/** /**
* Get hash value of the default config * Get hash value of the default config
*/ */
private fun testBaseConfig(defaultConfig: ConfigurationSection): Int{ private fun testBaseConfig(defaultConfig: ConfigurationSection): Int {
var result = 0 var result = 0
for (key in ConfigOptions.getBasicConfigKeys()) { for (key in ConfigOptions.getBasicConfigKeys()) {
result = result xor getHashFromKey(defaultConfig,key) result = result xor getHashFromKey(defaultConfig, key)
} }
return result return result
} }
@ -66,7 +65,7 @@ object MetricsUtil {
/** /**
* Test if the used configuration is the default config * Test if the used configuration is the default config
*/ */
fun testIfConfigIsDefault(){ fun testIfConfigIsDefault() {
// Calculate hash of config // Calculate hash of config
val baseConfig = testBaseConfig(ConfigHolder.DEFAULT_CONFIG.config) val baseConfig = testBaseConfig(ConfigHolder.DEFAULT_CONFIG.config)
val limitEnchantConfig = getHashFromKey(ConfigHolder.DEFAULT_CONFIG.config, ConfigOptions.ENCHANT_LIMIT_ROOT) val limitEnchantConfig = getHashFromKey(ConfigHolder.DEFAULT_CONFIG.config, ConfigOptions.ENCHANT_LIMIT_ROOT)
@ -82,32 +81,44 @@ object MetricsUtil {
isDefaultItemGroupsConfig = itemGroupsConfigHash == itemGroupConfig isDefaultItemGroupsConfig = itemGroupsConfigHash == itemGroupConfig
isDefaultUnitRepairItemConfig = unitRepairItemConfigHash == unitRepairConfig isDefaultUnitRepairItemConfig = unitRepairItemConfigHash == unitRepairConfig
// If not default and debug flag active, print the hash. // If not default and debug flag active, print the hash.
if(ConfigOptions.debugLog){ if (ConfigOptions.debugLog) {
if(!isDefaultBaseConfig){CustomAnvil.log("baseConfig: $baseConfig")} if (!isDefaultBaseConfig) {
if(!isDefaultEnchantLimitsConfig){CustomAnvil.log("limitEnchantConfig: $limitEnchantConfig")} CustomAnvil.log("baseConfig: $baseConfig")
if(!isDefaultEnchantValuesConfig){CustomAnvil.log("enchantValueConfig: $enchantValueConfig")} }
if(!isDefaultEnchantConflictConfig){CustomAnvil.log("enchantConflictConfig: $enchantConflictConfig")} if (!isDefaultEnchantLimitsConfig) {
if(!isDefaultItemGroupsConfig){CustomAnvil.log("itemGroupConfig: $itemGroupConfig")} CustomAnvil.log("limitEnchantConfig: $limitEnchantConfig")
if(!isDefaultUnitRepairItemConfig){CustomAnvil.log("unitRepairConfig: $unitRepairConfig")} }
if (!isDefaultEnchantValuesConfig) {
CustomAnvil.log("enchantValueConfig: $enchantValueConfig")
}
if (!isDefaultEnchantConflictConfig) {
CustomAnvil.log("enchantConflictConfig: $enchantConflictConfig")
}
if (!isDefaultItemGroupsConfig) {
CustomAnvil.log("itemGroupConfig: $itemGroupConfig")
}
if (!isDefaultUnitRepairItemConfig) {
CustomAnvil.log("unitRepairConfig: $unitRepairConfig")
}
} }
} }
fun notifyChange(holder: ConfigHolder, path: String){ fun notifyChange(holder: ConfigHolder, path: String) {
if(ConfigHolder.DEFAULT_CONFIG.equals(holder)){ if (ConfigHolder.DEFAULT_CONFIG.equals(holder)) {
if(path.startsWith(ConfigOptions.ENCHANT_LIMIT_ROOT+".")){ if (path.startsWith(ConfigOptions.ENCHANT_LIMIT_ROOT + ".")) {
isDefaultEnchantLimitsConfig = false; isDefaultEnchantLimitsConfig = false
}else if(path.startsWith(ConfigOptions.ENCHANT_VALUES_ROOT+".")){ } else if (path.startsWith(ConfigOptions.ENCHANT_VALUES_ROOT + ".")) {
isDefaultEnchantValuesConfig = false; isDefaultEnchantValuesConfig = false
}else{ } else {
isDefaultBaseConfig = false; isDefaultBaseConfig = false
} }
}else if(ConfigHolder.CONFLICT_HOLDER.equals(holder)){ } else if (ConfigHolder.CONFLICT_HOLDER.equals(holder)) {
isDefaultEnchantConflictConfig = false; isDefaultEnchantConflictConfig = false
}else if(ConfigHolder.ITEM_GROUP_HOLDER.equals(holder)){ } else if (ConfigHolder.ITEM_GROUP_HOLDER.equals(holder)) {
isDefaultItemGroupsConfig = false; isDefaultItemGroupsConfig = false
}else if(ConfigHolder.UNIT_REPAIR_HOLDER.equals(holder)){ } else if (ConfigHolder.UNIT_REPAIR_HOLDER.equals(holder)) {
isDefaultUnitRepairItemConfig = false; isDefaultUnitRepairItemConfig = false
} }
} }

21
src/main/kotlin/xyz/alexcrea/cuanvil/util/UnitRepairUtil.kt
View file

@ -8,6 +8,7 @@ object UnitRepairUtil {
// Default value for user set default unit repair % // Default value for user set default unit repair %
private const val DEFAULT_DEFAULT_UNIT_REPAIR = 0.25 private const val DEFAULT_DEFAULT_UNIT_REPAIR = 0.25
// Path to user default unit repair value // Path to user default unit repair value
private const val UNIT_REPAIR_DEFAULT_PATH = "default_repair_amount" private const val UNIT_REPAIR_DEFAULT_PATH = "default_repair_amount"
@ -18,23 +19,23 @@ object UnitRepairUtil {
fun ItemStack.getRepair( fun ItemStack.getRepair(
other: ItemStack? other: ItemStack?
): Double? { ): Double? {
if(other == null) return null if (other == null) return null
val config = ConfigHolder.UNIT_REPAIR_HOLDER.config val config = ConfigHolder.UNIT_REPAIR_HOLDER.config
// Get configuration section if exist // Get configuration section if exist
val otherName = other.type.name.uppercase() val otherName = other.type.name.uppercase()
var section = config.getConfigurationSection(otherName) var section = config.getConfigurationSection(otherName)
if(section == null){ if (section == null) {
section = config.getConfigurationSection(otherName.lowercase()) section = config.getConfigurationSection(otherName.lowercase())
if(section == null) return null if (section == null) return null
} }
// Get repair amount // Get repair amount
var userDefault = config.getDouble(UNIT_REPAIR_DEFAULT_PATH, DEFAULT_DEFAULT_UNIT_REPAIR) var userDefault = config.getDouble(UNIT_REPAIR_DEFAULT_PATH, DEFAULT_DEFAULT_UNIT_REPAIR)
if(userDefault <= 0){ if (userDefault <= 0) {
userDefault = DEFAULT_DEFAULT_UNIT_REPAIR userDefault = DEFAULT_DEFAULT_UNIT_REPAIR
} }
return getRepairAmount(this,section,userDefault) return getRepairAmount(this, section, userDefault)
} }
/** /**
@ -42,16 +43,16 @@ object UnitRepairUtil {
* null if not found. * null if not found.
* If value is set to less than or equal to 0 then it will be set to default * If value is set to less than or equal to 0 then it will be set to default
*/ */
private fun getRepairAmount(item: ItemStack, section: ConfigurationSection, default: Double): Double?{ private fun getRepairAmount(item: ItemStack, section: ConfigurationSection, default: Double): Double? {
val itemName = item.type.name.uppercase() val itemName = item.type.name.uppercase()
val repairValue = if(section.isDouble(itemName)){ val repairValue = if (section.isDouble(itemName)) {
section.getDouble(itemName) section.getDouble(itemName)
}else if(section.isDouble(itemName.lowercase())){ } else if (section.isDouble(itemName.lowercase())) {
section.getDouble(itemName.lowercase()) section.getDouble(itemName.lowercase())
}else{ } else {
return null return null
} }
if(repairValue <= 0) if (repairValue <= 0)
return default return default
return repairValue return repairValue
} }

168
src/main/resources/enchant_conflict.yml
View file

@ -12,159 +12,159 @@
# ---------------------------------------------------- # ----------------------------------------------------
restriction_aqua_affinity: restriction_aqua_affinity:
enchantments: [aqua_affinity] enchantments: [ aqua_affinity ]
notAffectedGroups: [enchanted_book, helmets] notAffectedGroups: [ enchanted_book, helmets ]
restriction_bane_of_arthropods: restriction_bane_of_arthropods:
enchantments: [bane_of_arthropods] enchantments: [ bane_of_arthropods ]
notAffectedGroups: [enchanted_book, melee_weapons] notAffectedGroups: [ enchanted_book, melee_weapons ]
restriction_blast_protection: restriction_blast_protection:
enchantments: [blast_protection] enchantments: [ blast_protection ]
notAffectedGroups: [enchanted_book, armors] notAffectedGroups: [ enchanted_book, armors ]
restriction_channeling: restriction_channeling:
enchantments: [channeling] enchantments: [ channeling ]
notAffectedGroups: [enchanted_book, trident] notAffectedGroups: [ enchanted_book, trident ]
restriction_binding_curse: restriction_binding_curse:
enchantments: [binding_curse] enchantments: [ binding_curse ]
notAffectedGroups: [enchanted_book, wearable] notAffectedGroups: [ enchanted_book, wearable ]
restriction_vanishing_curse: restriction_vanishing_curse:
enchantments: [vanishing_curse] enchantments: [ vanishing_curse ]
notAffectedGroups: [enchanted_book, can_vanish] notAffectedGroups: [ enchanted_book, can_vanish ]
restriction_depth_strider: restriction_depth_strider:
enchantments: [depth_strider] enchantments: [ depth_strider ]
notAffectedGroups: [enchanted_book, boots] notAffectedGroups: [ enchanted_book, boots ]
restriction_efficiency: restriction_efficiency:
enchantments: [efficiency] enchantments: [ efficiency ]
notAffectedGroups: [enchanted_book, tools, shears] notAffectedGroups: [ enchanted_book, tools, shears ]
restriction_feather_falling: restriction_feather_falling:
enchantments: [feather_falling] enchantments: [ feather_falling ]
notAffectedGroups: [enchanted_book, boots] notAffectedGroups: [ enchanted_book, boots ]
restriction_fire_aspect: restriction_fire_aspect:
enchantments: [fire_aspect] enchantments: [ fire_aspect ]
notAffectedGroups: [enchanted_book, swords] notAffectedGroups: [ enchanted_book, swords ]
restriction_fire_protection: restriction_fire_protection:
enchantments: [fire_protection] enchantments: [ fire_protection ]
notAffectedGroups: [enchanted_book, armors] notAffectedGroups: [ enchanted_book, armors ]
restriction_flame: restriction_flame:
enchantments: [flame] enchantments: [ flame ]
notAffectedGroups: [enchanted_book, bow] notAffectedGroups: [ enchanted_book, bow ]
restriction_fortune: restriction_fortune:
enchantments: [fortune] enchantments: [ fortune ]
notAffectedGroups: [enchanted_book, tools] notAffectedGroups: [ enchanted_book, tools ]
restriction_frost_walker: restriction_frost_walker:
enchantments: [frost_walker] enchantments: [ frost_walker ]
notAffectedGroups: [enchanted_book, boots] notAffectedGroups: [ enchanted_book, boots ]
restriction_impaling: restriction_impaling:
enchantments: [impaling] enchantments: [ impaling ]
notAffectedGroups: [enchanted_book, trident] notAffectedGroups: [ enchanted_book, trident ]
restriction_infinity: restriction_infinity:
enchantments: [infinity] enchantments: [ infinity ]
notAffectedGroups: [enchanted_book, bow] notAffectedGroups: [ enchanted_book, bow ]
restriction_knockback: restriction_knockback:
enchantments: [knockback] enchantments: [ knockback ]
notAffectedGroups: [enchanted_book, swords] notAffectedGroups: [ enchanted_book, swords ]
restriction_looting: restriction_looting:
enchantments: [looting] enchantments: [ looting ]
notAffectedGroups: [enchanted_book, swords] notAffectedGroups: [ enchanted_book, swords ]
restriction_loyalty: restriction_loyalty:
enchantments: [loyalty] enchantments: [ loyalty ]
notAffectedGroups: [enchanted_book, trident] notAffectedGroups: [ enchanted_book, trident ]
restriction_lure: restriction_lure:
enchantments: [lure] enchantments: [ lure ]
notAffectedGroups: [enchanted_book, fishing_rod] notAffectedGroups: [ enchanted_book, fishing_rod ]
restriction_mending: restriction_mending:
enchantments: [mending] enchantments: [ mending ]
notAffectedGroups: [enchanted_book, can_unbreak] notAffectedGroups: [ enchanted_book, can_unbreak ]
restriction_multishot: restriction_multishot:
enchantments: [multishot] enchantments: [ multishot ]
notAffectedGroups: [enchanted_book, crossbow] notAffectedGroups: [ enchanted_book, crossbow ]
restriction_piercing: restriction_piercing:
enchantments: [piercing] enchantments: [ piercing ]
notAffectedGroups: [enchanted_book, crossbow] notAffectedGroups: [ enchanted_book, crossbow ]
restriction_power: restriction_power:
enchantments: [power] enchantments: [ power ]
notAffectedGroups: [enchanted_book, bow] notAffectedGroups: [ enchanted_book, bow ]
restriction_projectile_protection: restriction_projectile_protection:
enchantments: [projectile_protection] enchantments: [ projectile_protection ]
notAffectedGroups: [enchanted_book, armors] notAffectedGroups: [ enchanted_book, armors ]
restriction_protection: restriction_protection:
enchantments: [protection] enchantments: [ protection ]
notAffectedGroups: [enchanted_book, armors] notAffectedGroups: [ enchanted_book, armors ]
restriction_punch: restriction_punch:
enchantments: [punch] enchantments: [ punch ]
notAffectedGroups: [enchanted_book, bow] notAffectedGroups: [ enchanted_book, bow ]
restriction_quick_charge: restriction_quick_charge:
enchantments: [quick_charge] enchantments: [ quick_charge ]
notAffectedGroups: [enchanted_book, crossbow] notAffectedGroups: [ enchanted_book, crossbow ]
restriction_respiration: restriction_respiration:
enchantments: [respiration] enchantments: [ respiration ]
notAffectedGroups: [enchanted_book, helmets] notAffectedGroups: [ enchanted_book, helmets ]
restriction_riptide: restriction_riptide:
enchantments: [riptide] enchantments: [ riptide ]
notAffectedGroups: [enchanted_book, trident] notAffectedGroups: [ enchanted_book, trident ]
restriction_sharpness: restriction_sharpness:
enchantments: [sharpness] enchantments: [ sharpness ]
notAffectedGroups: [enchanted_book, melee_weapons] notAffectedGroups: [ enchanted_book, melee_weapons ]
restriction_silk_touch: restriction_silk_touch:
enchantments: [silk_touch] enchantments: [ silk_touch ]
notAffectedGroups: [enchanted_book, tools] notAffectedGroups: [ enchanted_book, tools ]
restriction_smite: restriction_smite:
enchantments: [smite] enchantments: [ smite ]
notAffectedGroups: [enchanted_book, melee_weapons] notAffectedGroups: [ enchanted_book, melee_weapons ]
restriction_soul_speed: restriction_soul_speed:
enchantments: [soul_speed] enchantments: [ soul_speed ]
notAffectedGroups: [enchanted_book, boots] notAffectedGroups: [ enchanted_book, boots ]
restriction_sweeping: restriction_sweeping:
enchantments: [sweeping] enchantments: [ sweeping ]
notAffectedGroups: [enchanted_book, swords] notAffectedGroups: [ enchanted_book, swords ]
# Do not exist in 1.18, that mean useInFuture will be set to true # Do not exist in 1.18, that mean useInFuture will be set to true
# useInFuture set to true also mean it will not warn if there is an issue # useInFuture set to true also mean it will not warn if there is an issue
restriction_swift_sneak: restriction_swift_sneak:
useInFuture: true useInFuture: true
enchantments: [swift_sneak] enchantments: [ swift_sneak ]
notAffectedGroups: [enchanted_book, boots] notAffectedGroups: [ enchanted_book, boots ]
restriction_thorns: restriction_thorns:
enchantments: [thorns] enchantments: [ thorns ]
notAffectedGroups: [enchanted_book, armors] notAffectedGroups: [ enchanted_book, armors ]
restriction_unbreaking: restriction_unbreaking:
enchantments: [unbreaking] enchantments: [ unbreaking ]
notAffectedGroups: [enchanted_book, can_unbreak] notAffectedGroups: [ enchanted_book, can_unbreak ]
# ---------------------------------------------------- # ----------------------------------------------------
# Now we have conflicts about enchantment Incompatibility # Now we have conflicts about enchantment Incompatibility
@ -178,7 +178,7 @@ sword_enchant_conflict:
- bane_of_arthropods - bane_of_arthropods
- smite - smite
- sharpness - sharpness
notAffectedGroups: [] notAffectedGroups: [ ]
maxEnchantmentBeforeConflict: 1 maxEnchantmentBeforeConflict: 1
protection_enchant_conflict: protection_enchant_conflict:
@ -187,49 +187,49 @@ protection_enchant_conflict:
- fire_protection - fire_protection
- projectile_protection - projectile_protection
- protection - protection
notAffectedGroups: [] notAffectedGroups: [ ]
maxEnchantmentBeforeConflict: 1 maxEnchantmentBeforeConflict: 1
trident_conflict1: trident_conflict1:
enchantments: enchantments:
- channeling - channeling
- riptide - riptide
notAffectedGroups: [] notAffectedGroups: [ ]
maxEnchantmentBeforeConflict: 1 maxEnchantmentBeforeConflict: 1
trident_conflict2: trident_conflict2:
enchantments: enchantments:
- loyalty - loyalty
- riptide - riptide
notAffectedGroups: [] notAffectedGroups: [ ]
maxEnchantmentBeforeConflict: 1 maxEnchantmentBeforeConflict: 1
boot_conflict: boot_conflict:
enchantments: enchantments:
- depth_strider - depth_strider
- frost_walker - frost_walker
notAffectedGroups: [] notAffectedGroups: [ ]
maxEnchantmentBeforeConflict: 1 maxEnchantmentBeforeConflict: 1
tool_conflict: tool_conflict:
enchantments: enchantments:
- fortune - fortune
- silk_touch - silk_touch
notAffectedGroups: [] notAffectedGroups: [ ]
maxEnchantmentBeforeConflict: 1 maxEnchantmentBeforeConflict: 1
bow_conflict: bow_conflict:
enchantments: enchantments:
- mending - mending
- infinity - infinity
notAffectedGroups: [] notAffectedGroups: [ ]
maxEnchantmentBeforeConflict: 1 maxEnchantmentBeforeConflict: 1
crossbow_conflict: crossbow_conflict:
enchantments: enchantments:
- multishot - multishot
- piercing - piercing
notAffectedGroups: [] notAffectedGroups: [ ]
maxEnchantmentBeforeConflict: 1 maxEnchantmentBeforeConflict: 1
# ---------------------------------------------------- # ----------------------------------------------------

4
src/main/resources/plugin.yml
View file

@ -1,11 +1,11 @@
main: io.delilaheve.CustomAnvil main: io.delilaheve.CustomAnvil
name: CustomAnvil name: CustomAnvil
prefix: "Custom Anvil" prefix: "Custom Anvil"
version: 1.3.2-A1 version: 1.3.2-A2
description: Allow to customise anvil mechanics description: Allow to customise anvil mechanics
api-version: 1.18 api-version: 1.18
load: POSTWORLD load: POSTWORLD
authors: [DelilahEve, alexcrea] authors: [ DelilahEve, alexcrea ]
libraries: libraries:
- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 - org.jetbrains.kotlin:kotlin-stdlib:1.6.21
- com.github.stefvanschie.inventoryframework:IF:0.10.13 - com.github.stefvanschie.inventoryframework:IF:0.10.13