Upstream
/
ExcellentEnchants-spigot
mirror of https://github.com/nulli0n/ExcellentEnchants-spigot.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

v4.0.3 beta

This commit is contained in:
BuildTools 2024-04-03 21:29:47 +05:00
parent 79812ec42b
commit 77414a8172
15 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>ExcellentEnchants</artifactId> <artifactId>ExcellentEnchants</artifactId>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<version>4.0.2</version> <version>4.0.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
API/src/main/java/su/nightexpress/excellentenchants/api/enchantment/EnchantmentData.java
View File

@ -32,6 +32,8 @@ public interface EnchantmentData {
boolean isAvailableToUse(@NotNull World world); boolean isAvailableToUse(@NotNull World world);
boolean checkEnchantLimit(@NotNull ItemStack item);
boolean checkEnchantCategory(@NotNull ItemStack item); boolean checkEnchantCategory(@NotNull ItemStack item);
boolean checkItemCategory(@NotNull ItemStack item); boolean checkItemCategory(@NotNull ItemStack item);

14
Core/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>ExcellentEnchants</artifactId> <artifactId>ExcellentEnchants</artifactId>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<version>4.0.2</version> <version>4.0.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -73,32 +73,32 @@
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>API</artifactId> <artifactId>API</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>NMS</artifactId> <artifactId>NMS</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>V1_19_R3</artifactId> <artifactId>V1_19_R3</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>V1_20_R1</artifactId> <artifactId>V1_20_R1</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>V1_20_R2</artifactId> <artifactId>V1_20_R2</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>V1_20_R3</artifactId> <artifactId>V1_20_R3</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

5
Core/src/main/java/su/nightexpress/excellentenchants/config/Config.java
View File

@ -51,6 +51,11 @@ public class Config {
"[Default is true]" "[Default is true]"
); );
public static final ConfigValue<Integer> CORE_ITEM_ENCHANT_LIMIT = ConfigValue.create("Core.Item_Enchantments_Limit",
3,
"Sets max. amount of custom enchantments per item.",
"[Default is 3]");
public static final ConfigValue<Boolean> CORE_SWORD_ENCHANTS_TO_AXES = ConfigValue.create("Core.Sword_Enchants_To_Axes", public static final ConfigValue<Boolean> CORE_SWORD_ENCHANTS_TO_AXES = ConfigValue.create("Core.Sword_Enchants_To_Axes",
true, true,
"Sets whether or not Sword enchantments can be applied on Axes.", "Sets whether or not Sword enchantments can be applied on Axes.",

8
Core/src/main/java/su/nightexpress/excellentenchants/enchantment/data/AbstractEnchantmentData.java
View File

@ -343,6 +343,14 @@ public abstract class AbstractEnchantmentData extends AbstractFileData<EnchantsP
return this.isAvailableToUse(entity.getWorld()); return this.isAvailableToUse(entity.getWorld());
} }
@Override
public boolean checkEnchantLimit(@NotNull ItemStack item) {
int limit = Config.CORE_ITEM_ENCHANT_LIMIT.get();
int has = EnchantUtils.countCustomEnchantments(item);
return has < limit;
}
@Override @Override
public final boolean checkEnchantCategory(@NotNull ItemStack item) { public final boolean checkEnchantCategory(@NotNull ItemStack item) {
EnchantmentTarget category = this.getCategory(); EnchantmentTarget category = this.getCategory();

4
NMS/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>ExcellentEnchants</artifactId> <artifactId>ExcellentEnchants</artifactId>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<version>4.0.2</version> <version>4.0.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -33,7 +33,7 @@
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>API</artifactId> <artifactId>API</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
V1_19_R3/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>ExcellentEnchants</artifactId> <artifactId>ExcellentEnchants</artifactId>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<version>4.0.2</version> <version>4.0.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>NMS</artifactId> <artifactId>NMS</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
V1_19_R3/src/main/java/su/nightexpress/excellentenchants/nms/v1_19_R3/CustomEnchantment.java
View File

@ -73,6 +73,8 @@ public class CustomEnchantment extends Enchantment {
} }
public boolean canEnchant(@NotNull org.bukkit.inventory.ItemStack bukkitItem) { public boolean canEnchant(@NotNull org.bukkit.inventory.ItemStack bukkitItem) {
if (!this.enchantmentData.checkEnchantLimit(bukkitItem)) return false;
if (!this.enchantmentData.hasItemCategory()) { if (!this.enchantmentData.hasItemCategory()) {
if (this.enchantmentData.checkEnchantCategory(bukkitItem)) return true; if (this.enchantmentData.checkEnchantCategory(bukkitItem)) return true;
} }

4
V1_20_R1/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>ExcellentEnchants</artifactId> <artifactId>ExcellentEnchants</artifactId>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<version>4.0.2</version> <version>4.0.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>NMS</artifactId> <artifactId>NMS</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
V1_20_R1/src/main/java/su/nightexpress/excellentenchants/nms/v1_20_R1/CustomEnchantment.java
View File

@ -73,6 +73,8 @@ public class CustomEnchantment extends Enchantment {
} }
public boolean canEnchant(@NotNull org.bukkit.inventory.ItemStack bukkitItem) { public boolean canEnchant(@NotNull org.bukkit.inventory.ItemStack bukkitItem) {
if (!this.enchantmentData.checkEnchantLimit(bukkitItem)) return false;
if (!this.enchantmentData.hasItemCategory()) { if (!this.enchantmentData.hasItemCategory()) {
if (this.enchantmentData.checkEnchantCategory(bukkitItem)) return true; if (this.enchantmentData.checkEnchantCategory(bukkitItem)) return true;
} }

4
V1_20_R2/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>ExcellentEnchants</artifactId> <artifactId>ExcellentEnchants</artifactId>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<version>4.0.2</version> <version>4.0.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>NMS</artifactId> <artifactId>NMS</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
V1_20_R2/src/main/java/su/nightexpress/excellentenchants/nms/v1_20_R2/CustomEnchantment.java
View File

@ -73,6 +73,8 @@ public class CustomEnchantment extends Enchantment {
} }
public boolean canEnchant(@NotNull org.bukkit.inventory.ItemStack bukkitItem) { public boolean canEnchant(@NotNull org.bukkit.inventory.ItemStack bukkitItem) {
if (!this.enchantmentData.checkEnchantLimit(bukkitItem)) return false;
if (!this.enchantmentData.hasItemCategory()) { if (!this.enchantmentData.hasItemCategory()) {
if (this.enchantmentData.checkEnchantCategory(bukkitItem)) return true; if (this.enchantmentData.checkEnchantCategory(bukkitItem)) return true;
} }

6
V1_20_R3/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>ExcellentEnchants</artifactId> <artifactId>ExcellentEnchants</artifactId>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<version>4.0.2</version> <version>4.0.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -27,12 +27,12 @@
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>API</artifactId> <artifactId>API</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>NMS</artifactId> <artifactId>NMS</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
V1_20_R3/src/main/java/su/nightexpress/excellentenchants/nms/v1_20_R3/CustomEnchantment.java
View File

@ -73,6 +73,8 @@ public class CustomEnchantment extends Enchantment {
} }
public boolean canEnchant(@NotNull org.bukkit.inventory.ItemStack bukkitItem) { public boolean canEnchant(@NotNull org.bukkit.inventory.ItemStack bukkitItem) {
if (!this.enchantmentData.checkEnchantLimit(bukkitItem)) return false;
if (!this.enchantmentData.hasItemCategory()) { if (!this.enchantmentData.hasItemCategory()) {
if (this.enchantmentData.checkEnchantCategory(bukkitItem)) return true; if (this.enchantmentData.checkEnchantCategory(bukkitItem)) return true;
} }

2
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>su.nightexpress.excellentenchants</groupId> <groupId>su.nightexpress.excellentenchants</groupId>
<artifactId>ExcellentEnchants</artifactId> <artifactId>ExcellentEnchants</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>4.0.2</version> <version>4.0.3</version>
<modules> <modules>
<module>Core</module> <module>Core</module>
<module>NMS</module> <module>NMS</module>