Skip to content

Commit bf9f484

Browse files
author
DragonEggBedrockBreaking
committed
Move enchantment conflicts to their own subfolder
1 parent 9568794 commit bf9f484

13 files changed

+54
-49
lines changed

‎src/main/java/uk/debb/vanilla_disable/gamerules/RegisterGamerules.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -898,20 +898,22 @@ public void onInitialize() {
898898
"bindingCurse", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
899899
VANISHING_CURSE = GameRuleRegistry.register(
900900
"vanishingCurse", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
901-
BOOT_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
902-
"bootEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
903-
BOW_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
904-
"bowEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
905-
CROSSBOW_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
906-
"crossbowEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
907-
DAMAGE_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
908-
"damageEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
909-
MINING_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
910-
"miningEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
911-
PROTECTION_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
912-
"protectionEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
913-
TRIDENT_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
914-
"tridentEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
901+
if (VanillaDisableMixinConfigPlugin.enchantment_conflicts) {
902+
BOOT_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
903+
"bootEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
904+
BOW_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
905+
"bowEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
906+
CROSSBOW_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
907+
"crossbowEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
908+
DAMAGE_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
909+
"damageEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
910+
MINING_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
911+
"miningEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
912+
PROTECTION_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
913+
"protectionEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
914+
TRIDENT_ENCHANTMENT_CONFLICTS = GameRuleRegistry.register(
915+
"tridentEnchantmentConflicts", CreateGameruleCategories.VD_ENCHANTMENTS, GameRuleFactory.createBooleanRule(true));
916+
}
915917
}
916918
if (VanillaDisableMixinConfigPlugin.worldgen) {
917919
BASTION_REMNANT_GENERATION = GameRuleRegistry.register(

‎src/main/java/uk/debb/vanilla_disable/mixin/VanillaDisableMixinConfigPlugin.java

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class VanillaDisableMixinConfigPlugin extends AbstractCaffeineConfigMixin
1212
public static boolean despawning;
1313
public static boolean effects;
1414
public static boolean enchantments;
15+
public static boolean enchantment_conflicts;
1516
public static boolean fluids;
1617
public static boolean knockback;
1718
public static boolean misc;
@@ -31,6 +32,7 @@ protected CaffeineConfig createConfig() {
3132
.addMixinOption("despawning", true)
3233
.addMixinOption("effects", true)
3334
.addMixinOption("enchantments", true)
35+
.addMixinOption("enchantments.enchantment_conflicts", true)
3436
.addMixinOption("fluids", true)
3537
.addMixinOption("knockback", true)
3638
.addMixinOption("misc", true)
@@ -50,21 +52,22 @@ protected CaffeineConfig createConfig() {
5052
}
5153

5254
private void updateData() {
53-
commands = this.caffeineConfig.getEffectiveOptionForMixin("commands.MixinCommands").isEnabled();
54-
damage = this.caffeineConfig.getEffectiveOptionForMixin("damage.MixinPlayer").isEnabled();
55-
despawning = this.caffeineConfig.getEffectiveOptionForMixin("despawning.MixinItemEntity").isEnabled();
56-
effects = this.caffeineConfig.getEffectiveOptionForMixin("effects.MixinLivingEntity").isEnabled();
57-
enchantments = this.caffeineConfig.getEffectiveOptionForMixin("enchantments.MixinEnchantmentHelper").isEnabled();
58-
fluids = this.caffeineConfig.getEffectiveOptionForMixin("fluids.MixinBucketItem").isEnabled();
59-
knockback = this.caffeineConfig.getEffectiveOptionForMixin("knockback.MixinLivingEntity").isEnabled();
60-
misc = this.caffeineConfig.getEffectiveOptionForMixin("misc.MixinBeaconBlockEntity").isEnabled();
61-
misc_hunger = this.caffeineConfig.getEffectiveOptionForMixin("misc.hunger.MixinFoodData").isEnabled();
62-
mob = this.caffeineConfig.getEffectiveOptionForMixin("mob.MixinAbstractPiglin").isEnabled();
63-
player = this.caffeineConfig.getEffectiveOptionForMixin("player.MixinEntity").isEnabled();
64-
redstone = this.caffeineConfig.getEffectiveOptionForMixin("redstone.MixinButtonBlock").isEnabled();
65-
spawn_limits = this.caffeineConfig.getEffectiveOptionForMixin("spawn_limits.MixinMobCategory").isEnabled();
66-
spawning = this.caffeineConfig.getEffectiveOptionForMixin("spawning.MixinBaseSpawner").isEnabled();
67-
worldgen = this.caffeineConfig.getEffectiveOptionForMixin("worldgen.MixinBiomeGenerationSettings").isEnabled();
55+
commands = this.caffeineConfig.getEffectiveOptionForMixin("commands.MixinCommands").isEnabled();
56+
damage = this.caffeineConfig.getEffectiveOptionForMixin("damage.MixinPlayer").isEnabled();
57+
despawning = this.caffeineConfig.getEffectiveOptionForMixin("despawning.MixinItemEntity").isEnabled();
58+
effects = this.caffeineConfig.getEffectiveOptionForMixin("effects.MixinLivingEntity").isEnabled();
59+
enchantments = this.caffeineConfig.getEffectiveOptionForMixin("enchantments.MixinEnchantmentHelper").isEnabled();
60+
enchantment_conflicts = this.caffeineConfig.getEffectiveOptionForMixin("enchantments.enchantment_conflicts.MixinDamageEnchantment").isEnabled();
61+
fluids = this.caffeineConfig.getEffectiveOptionForMixin("fluids.MixinBucketItem").isEnabled();
62+
knockback = this.caffeineConfig.getEffectiveOptionForMixin("knockback.MixinLivingEntity").isEnabled();
63+
misc = this.caffeineConfig.getEffectiveOptionForMixin("misc.MixinBeaconBlockEntity").isEnabled();
64+
misc_hunger = this.caffeineConfig.getEffectiveOptionForMixin("misc.hunger.MixinFoodData").isEnabled();
65+
mob = this.caffeineConfig.getEffectiveOptionForMixin("mob.MixinAbstractPiglin").isEnabled();
66+
player = this.caffeineConfig.getEffectiveOptionForMixin("player.MixinEntity").isEnabled();
67+
redstone = this.caffeineConfig.getEffectiveOptionForMixin("redstone.MixinButtonBlock").isEnabled();
68+
spawn_limits = this.caffeineConfig.getEffectiveOptionForMixin("spawn_limits.MixinMobCategory").isEnabled();
69+
spawning = this.caffeineConfig.getEffectiveOptionForMixin("spawning.MixinBaseSpawner").isEnabled();
70+
worldgen = this.caffeineConfig.getEffectiveOptionForMixin("worldgen.MixinBiomeGenerationSettings").isEnabled();
6871
}
6972

7073
@Override

‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/MixinArrowInfiniteEnchantment.java renamed to ‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/enchantment_conflicts/MixinArrowInfiniteEnchantment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.debb.vanilla_disable.mixin.enchantments;
1+
package uk.debb.vanilla_disable.mixin.enchantments.enchantment_conflicts;
22

33
import net.minecraft.world.entity.EquipmentSlot;
44
import net.minecraft.world.item.enchantment.ArrowInfiniteEnchantment;

‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/MixinArrowPiercingEnchantment.java renamed to ‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/enchantment_conflicts/MixinArrowPiercingEnchantment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.debb.vanilla_disable.mixin.enchantments;
1+
package uk.debb.vanilla_disable.mixin.enchantments.enchantment_conflicts;
22

33
import net.minecraft.world.entity.EquipmentSlot;
44
import net.minecraft.world.item.enchantment.ArrowPiercingEnchantment;

‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/MixinDamageEnchantment.java renamed to ‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/enchantment_conflicts/MixinDamageEnchantment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.debb.vanilla_disable.mixin.enchantments;
1+
package uk.debb.vanilla_disable.mixin.enchantments.enchantment_conflicts;
22

33
import net.minecraft.world.entity.EquipmentSlot;
44
import net.minecraft.world.item.enchantment.DamageEnchantment;

‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/MixinFrostWalkerEnchantment.java renamed to ‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/enchantment_conflicts/MixinFrostWalkerEnchantment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.debb.vanilla_disable.mixin.enchantments;
1+
package uk.debb.vanilla_disable.mixin.enchantments.enchantment_conflicts;
22

33
import net.minecraft.world.entity.EquipmentSlot;
44
import net.minecraft.world.item.enchantment.Enchantment;

‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/MixinLootBonusEnchantment.java renamed to ‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/enchantment_conflicts/MixinLootBonusEnchantment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.debb.vanilla_disable.mixin.enchantments;
1+
package uk.debb.vanilla_disable.mixin.enchantments.enchantment_conflicts;
22

33
import net.minecraft.world.entity.EquipmentSlot;
44
import net.minecraft.world.item.enchantment.Enchantment;

‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/MixinMultiShotEnchantment.java renamed to ‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/enchantment_conflicts/MixinMultiShotEnchantment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.debb.vanilla_disable.mixin.enchantments;
1+
package uk.debb.vanilla_disable.mixin.enchantments.enchantment_conflicts;
22

33
import net.minecraft.world.entity.EquipmentSlot;
44
import net.minecraft.world.item.enchantment.Enchantment;

‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/MixinProtectionEnchantment.java renamed to ‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/enchantment_conflicts/MixinProtectionEnchantment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.debb.vanilla_disable.mixin.enchantments;
1+
package uk.debb.vanilla_disable.mixin.enchantments.enchantment_conflicts;
22

33
import net.minecraft.world.entity.EquipmentSlot;
44
import net.minecraft.world.item.enchantment.Enchantment;

‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/MixinTridentRiptideEnchantment.java renamed to ‎src/main/java/uk/debb/vanilla_disable/mixin/enchantments/enchantment_conflicts/MixinTridentRiptideEnchantment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.debb.vanilla_disable.mixin.enchantments;
1+
package uk.debb.vanilla_disable.mixin.enchantments.enchantment_conflicts;
22

33
import net.minecraft.world.entity.EquipmentSlot;
44
import net.minecraft.world.item.enchantment.Enchantment;

0 commit comments

Comments
 (0)