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

Renamed CAVanillaEnchantment to CABukkitEnchantment for clarity reason.

Browse source
This commit is contained in:
alexcrea 2024-07-12 01:06:32 +02:00
parent b467823f82
commit 7407cfd135
No known key found for this signature in database
GPG key ID: 43FD265DB0DBF91F
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/xyz/alexcrea/cuanvil/api/EnchantmentApi.java
View file

@ -13,7 +13,7 @@ import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry;
import xyz.alexcrea.cuanvil.enchant.EnchantmentRarity; import xyz.alexcrea.cuanvil.enchant.EnchantmentRarity;
import xyz.alexcrea.cuanvil.enchant.bulk.BulkCleanEnchantOperation; import xyz.alexcrea.cuanvil.enchant.bulk.BulkCleanEnchantOperation;
import xyz.alexcrea.cuanvil.enchant.bulk.BulkGetEnchantOperation; import xyz.alexcrea.cuanvil.enchant.bulk.BulkGetEnchantOperation;
import xyz.alexcrea.cuanvil.enchant.wrapped.CAVanillaEnchantment; import xyz.alexcrea.cuanvil.enchant.wrapped.CABukkitEnchantment;
import xyz.alexcrea.cuanvil.gui.config.global.EnchantCostConfigGui; import xyz.alexcrea.cuanvil.gui.config.global.EnchantCostConfigGui;
import xyz.alexcrea.cuanvil.gui.config.global.EnchantLimitConfigGui; import xyz.alexcrea.cuanvil.gui.config.global.EnchantLimitConfigGui;
@ -62,9 +62,9 @@ public class EnchantmentApi {
*/ */
public static boolean registerEnchantment(@NotNull Enchantment enchantment, @Nullable EnchantmentRarity defaultRarity){ public static boolean registerEnchantment(@NotNull Enchantment enchantment, @Nullable EnchantmentRarity defaultRarity){
if(defaultRarity == null) if(defaultRarity == null)
return registerEnchantment(new CAVanillaEnchantment(enchantment)); return registerEnchantment(new CABukkitEnchantment(enchantment));
return registerEnchantment(new CAVanillaEnchantment(enchantment, defaultRarity)); return registerEnchantment(new CABukkitEnchantment(enchantment, defaultRarity));
} }
/** /**
@ -76,7 +76,7 @@ public class EnchantmentApi {
* @return True if successful. * @return True if successful.
*/ */
public static boolean registerEnchantment(@NotNull Enchantment enchantment){ public static boolean registerEnchantment(@NotNull Enchantment enchantment){
return registerEnchantment(new CAVanillaEnchantment(enchantment)); return registerEnchantment(new CABukkitEnchantment(enchantment));
} }
/** /**

4
src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java
View file

@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
import xyz.alexcrea.cuanvil.enchant.bulk.BukkitEnchantBulkOperation; import xyz.alexcrea.cuanvil.enchant.bulk.BukkitEnchantBulkOperation;
import xyz.alexcrea.cuanvil.enchant.bulk.BulkCleanEnchantOperation; import xyz.alexcrea.cuanvil.enchant.bulk.BulkCleanEnchantOperation;
import xyz.alexcrea.cuanvil.enchant.bulk.BulkGetEnchantOperation; import xyz.alexcrea.cuanvil.enchant.bulk.BulkGetEnchantOperation;
import xyz.alexcrea.cuanvil.enchant.wrapped.CAVanillaEnchantment; import xyz.alexcrea.cuanvil.enchant.wrapped.CABukkitEnchantment;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
@ -48,7 +48,7 @@ public class CAEnchantmentRegistry {
public void registerBukkit(){ public void registerBukkit(){
// Register enchantment // Register enchantment
for (Enchantment enchantment : Enchantment.values()) { for (Enchantment enchantment : Enchantment.values()) {
register(new CAVanillaEnchantment(enchantment)); register(new CABukkitEnchantment(enchantment));
} }
// Add bukkit enchantment bulk operation // Add bukkit enchantment bulk operation

6
src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAVanillaEnchantment.java → src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CABukkitEnchantment.java
View file

@ -16,18 +16,18 @@ import java.util.Locale;
/** /**
* Custom Anvil enchantment implementation for vanilla registered enchantment. * Custom Anvil enchantment implementation for vanilla registered enchantment.
*/ */
public class CAVanillaEnchantment extends CAEnchantmentBase { public class CABukkitEnchantment extends CAEnchantmentBase {
private final @NotNull Enchantment enchantment; private final @NotNull Enchantment enchantment;
public CAVanillaEnchantment(@NotNull Enchantment enchantment, @Nullable EnchantmentRarity rarity){ public CABukkitEnchantment(@NotNull Enchantment enchantment, @Nullable EnchantmentRarity rarity){
super(enchantment.getKey(), super(enchantment.getKey(),
rarity, rarity,
enchantment.getMaxLevel()); enchantment.getMaxLevel());
this.enchantment = enchantment; this.enchantment = enchantment;
} }
public CAVanillaEnchantment(@NotNull Enchantment enchantment){ public CABukkitEnchantment(@NotNull Enchantment enchantment){
this(enchantment, getRarity(enchantment)); this(enchantment, getRarity(enchantment));
} }

4
src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEcoEnchant.java
View file

@ -11,7 +11,7 @@ import xyz.alexcrea.cuanvil.enchant.EnchantmentRarity;
import java.util.Map; import java.util.Map;
public class CAEcoEnchant extends CAVanillaEnchantment implements AdditionalTestEnchantment { public class CAEcoEnchant extends CABukkitEnchantment implements AdditionalTestEnchantment {
private final @NotNull EcoEnchant ecoEnchant; private final @NotNull EcoEnchant ecoEnchant;
@ -28,7 +28,7 @@ public class CAEcoEnchant extends CAVanillaEnchantment implements AdditionalTest
} }
for (CAEnchantment other : enchantments.keySet()) { for (CAEnchantment other : enchantments.keySet()) {
if(other instanceof CAVanillaEnchantment otherVanilla if(other instanceof CABukkitEnchantment otherVanilla
&& this.ecoEnchant.conflictsWith(otherVanilla.getEnchant())){ && this.ecoEnchant.conflictsWith(otherVanilla.getEnchant())){
return true; return true;
} }