diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwAxe.java b/src/main/java/chronosacaria/mcdw/bases/McdwAxe.java index 0ac22ab8..82d46be4 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwAxe.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwAxe.java @@ -47,7 +47,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.axeEnum.getInnateEnchantments(); + if(this.axeEnum.getIsEnabled()) + return this.axeEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwBow.java b/src/main/java/chronosacaria/mcdw/bases/McdwBow.java index 72d7c700..76c0baf3 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwBow.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwBow.java @@ -95,7 +95,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.bowsEnum.getInnateEnchantments(); + if (this.bowsEnum.getIsEnabled()) + return this.bowsEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwCrossbow.java b/src/main/java/chronosacaria/mcdw/bases/McdwCrossbow.java index db1c9282..13d196d1 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwCrossbow.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwCrossbow.java @@ -71,7 +71,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.crossbowsEnum.getInnateEnchantments(); + if (this.crossbowsEnum.getIsEnabled()) + return this.crossbowsEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwDagger.java b/src/main/java/chronosacaria/mcdw/bases/McdwDagger.java index c43b6f85..8295a7b8 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwDagger.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwDagger.java @@ -59,7 +59,9 @@ public ItemStack getDefaultStack() { @Override public @Nullable Map getInnateEnchantments() { - return this.daggersEnum.getInnateEnchantments(); + if (this.daggersEnum.getIsEnabled()) + return this.daggersEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwDoubleAxe.java b/src/main/java/chronosacaria/mcdw/bases/McdwDoubleAxe.java index c4ab3e23..6bfbc20f 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwDoubleAxe.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwDoubleAxe.java @@ -47,7 +47,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.doubleAxesEnum.getInnateEnchantments(); + if (this.doubleAxesEnum.getIsEnabled()) + return this.doubleAxesEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwGauntlet.java b/src/main/java/chronosacaria/mcdw/bases/McdwGauntlet.java index d28e031d..07d7bb93 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwGauntlet.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwGauntlet.java @@ -56,7 +56,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.gauntletsEnum.getInnateEnchantments(); + if (this.gauntletsEnum.getIsEnabled()) + return this.gauntletsEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwGlaive.java b/src/main/java/chronosacaria/mcdw/bases/McdwGlaive.java index ad0f29da..f9baab0d 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwGlaive.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwGlaive.java @@ -104,7 +104,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.glaivesEnum.getInnateEnchantments(); + if (this.glaivesEnum.getIsEnabled()) + return this.glaivesEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwHammer.java b/src/main/java/chronosacaria/mcdw/bases/McdwHammer.java index bacdc66c..f21a09b4 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwHammer.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwHammer.java @@ -50,7 +50,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.hammersEnum.getInnateEnchantments(); + if (this.hammersEnum.getIsEnabled()) + return this.hammersEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwLongbow.java b/src/main/java/chronosacaria/mcdw/bases/McdwLongbow.java index 65e335d3..ea67a2d0 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwLongbow.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwLongbow.java @@ -75,7 +75,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.longbowsEnum.getInnateEnchantments(); + if (this.longbowsEnum.getIsEnabled()) + return this.longbowsEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwScythe.java b/src/main/java/chronosacaria/mcdw/bases/McdwScythe.java index 5b5d6f64..562a6d58 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwScythe.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwScythe.java @@ -47,7 +47,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.scythesEnum.getInnateEnchantments(); + if (this.scythesEnum.getIsEnabled()) + return this.scythesEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwShortbow.java b/src/main/java/chronosacaria/mcdw/bases/McdwShortbow.java index 8f1015ab..271ed170 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwShortbow.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwShortbow.java @@ -75,7 +75,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.shortbowsEnum.getInnateEnchantments(); + if (this.shortbowsEnum.getIsEnabled()) + return this.shortbowsEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwSickle.java b/src/main/java/chronosacaria/mcdw/bases/McdwSickle.java index b93419d2..a108c696 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwSickle.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwSickle.java @@ -56,7 +56,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.sicklesEnum.getInnateEnchantments(); + if (this.sicklesEnum.getIsEnabled()) + return this.sicklesEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwSoulDagger.java b/src/main/java/chronosacaria/mcdw/bases/McdwSoulDagger.java index f01610fc..72ddc147 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwSoulDagger.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwSoulDagger.java @@ -47,7 +47,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.soulDaggersEnum.getInnateEnchantments(); + if (this.soulDaggersEnum.getIsEnabled()) + return this.soulDaggersEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwSpear.java b/src/main/java/chronosacaria/mcdw/bases/McdwSpear.java index cc7aa790..5364bd0c 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwSpear.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwSpear.java @@ -128,7 +128,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.spearsEnum.getInnateEnchantments(); + if (this.spearsEnum.getIsEnabled()) + return this.spearsEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwStaff.java b/src/main/java/chronosacaria/mcdw/bases/McdwStaff.java index ff8bf048..af99dce9 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwStaff.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwStaff.java @@ -132,7 +132,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.stavesEnum.getInnateEnchantments(); + if (this.stavesEnum.getIsEnabled()) + return this.stavesEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwSword.java b/src/main/java/chronosacaria/mcdw/bases/McdwSword.java index e1d823de..23fe9e3d 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwSword.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwSword.java @@ -120,7 +120,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.swordsEnum.getInnateEnchantments(); + if (this.swordsEnum.getIsEnabled()) + return this.swordsEnum.getInnateEnchantments(); + return Map.of(); } @Override diff --git a/src/main/java/chronosacaria/mcdw/bases/McdwWhip.java b/src/main/java/chronosacaria/mcdw/bases/McdwWhip.java index db2c97e8..3b9d68cc 100644 --- a/src/main/java/chronosacaria/mcdw/bases/McdwWhip.java +++ b/src/main/java/chronosacaria/mcdw/bases/McdwWhip.java @@ -129,7 +129,9 @@ public ItemStack getDefaultStack() { @Override public Map getInnateEnchantments() { - return this.whipsEnum.getInnateEnchantments(); + if (this.whipsEnum.getIsEnabled()) + return this.whipsEnum.getInnateEnchantments(); + return Map.of(); } @Override