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

Updated to use more Java 16 feature

Browse Source
This commit is contained in:
Auxilor 2021-06-15 21:18:40 +01:00
parent c3c158207d
commit 633da45df2
6 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/enchants/EcoCraftEnchantment.java
View File

@ -18,7 +18,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
@Override @Override
public int getMaxLevel() { public int getMaxLevel() {
return metadata.getMaxLevel() == null ? this.getHandle().getMaxLevel() : metadata.getMaxLevel(); return metadata.maxLevel() == null ? this.getHandle().getMaxLevel() : metadata.maxLevel();
} }
@Override @Override

2
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/enchants/EcoCraftEnchantment.java
View File

@ -18,7 +18,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
@Override @Override
public int getMaxLevel() { public int getMaxLevel() {
return metadata.getMaxLevel() == null ? this.getHandle().getMaxLevel() : metadata.getMaxLevel(); return metadata.maxLevel() == null ? this.getHandle().getMaxLevel() : metadata.maxLevel();
} }
@Override @Override

2
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/enchants/EcoCraftEnchantment.java
View File

@ -18,7 +18,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
@Override @Override
public int getMaxLevel() { public int getMaxLevel() {
return metadata.getMaxLevel() == null ? this.getHandle().getMaxLevel() : metadata.getMaxLevel(); return metadata.maxLevel() == null ? this.getHandle().getMaxLevel() : metadata.maxLevel();
} }
@Override @Override

2
eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/enchants/EcoCraftEnchantment.java
View File

@ -18,7 +18,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
@Override @Override
public int getMaxLevel() { public int getMaxLevel() {
return metadata.getMaxLevel() == null ? this.getHandle().getMaxLevel() : metadata.getMaxLevel(); return metadata.maxLevel() == null ? this.getHandle().getMaxLevel() : metadata.maxLevel();
} }
@Override @Override

11
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/vanilla/VanillaEnchantmentMetadata.java
View File

@ -1,11 +1,6 @@
package com.willfp.ecoenchants.enchantments.support.vanilla; package com.willfp.ecoenchants.enchantments.support.vanilla;
import lombok.Data; public record VanillaEnchantmentMetadata(
Integer maxLevel
@Data ) {
public class VanillaEnchantmentMetadata {
/**
* The maximum level for the enchantment.
*/
private Integer maxLevel = null;
} }

4
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/vanilla/VanillaEnchantments.java
View File

@ -51,9 +51,7 @@ public class VanillaEnchantments {
)); ));
for (Enchantment enchantment : enchantments) { for (Enchantment enchantment : enchantments) {
VanillaEnchantmentMetadata metadata = new VanillaEnchantmentMetadata(); VanillaEnchantmentMetadata metadata = new VanillaEnchantmentMetadata(maxLevels.get(enchantment));
metadata.setMaxLevel(maxLevels.get(enchantment));
map.put(enchantment, metadata); map.put(enchantment, metadata);
} }