Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-23 15:15:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Cleaned up EnchantDisplay to work with eco 5.3.0"

Browse Source 
This reverts commit 2f3e210b
This commit is contained in:
Auxilor 2021-04-21 18:38:54 +01:00
parent 2be23e4f75
commit 1c35d35bd4
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
View File

@ -88,22 +88,7 @@ public class EnchantDisplay extends DisplayModule {
assert meta != null;
boolean hideEnchants = false;
if (meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS) || meta.hasItemFlag(ItemFlag.HIDE_POTION_EFFECTS)) {
hideEnchants = true;
}
if (meta.getPersistentDataContainer().has(legacyV, PersistentDataType.INTEGER)
|| (options.isUsingExperimentalHideFixer() && options.isUsingForceHideFixer())) {
hideEnchants = false;
}
if (options.isUsingExperimentalHideFixer() && meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS) && meta.hasItemFlag(ItemFlag.HIDE_POTION_EFFECTS)) {
hideEnchants = false;
}
boolean hide = hideEnchants;
boolean hide = (boolean) args[0];
List<String> itemLore = null;
@ -234,4 +219,35 @@ public class EnchantDisplay extends DisplayModule {
meta.getPersistentDataContainer().remove(keySkip);
itemStack.setItemMeta(meta);
}
@Override
protected Object[] generateVarArgs(@NotNull final ItemStack itemStack) {
ItemMeta meta = itemStack.getItemMeta();
if (meta == null) {
return new Object[]{false};
}
boolean hideEnchants = false;
if (meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS) || meta.hasItemFlag(ItemFlag.HIDE_POTION_EFFECTS)) {
hideEnchants = true;
}
if (meta.getPersistentDataContainer().has(legacyV, PersistentDataType.INTEGER)) {
hideEnchants = false;
}
if (Display.isFinalized(itemStack)) {
hideEnchants = false;
}
if (options.isUsingExperimentalHideFixer() && options.isUsingForceHideFixer()) {
hideEnchants = false;
}
if (options.isUsingExperimentalHideFixer() && meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS) && meta.hasItemFlag(ItemFlag.HIDE_POTION_EFFECTS)) {
hideEnchants = false;
}
return new Object[]{hideEnchants};
}
}