From 615adf17f0d6c8ce46e0897db4f7b1a5d5faa545 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 20 Dec 2023 18:15:24 -0600 Subject: [PATCH] remove frostbite and sunbeam --- .../io/redspace/ironsspellbooks/api/config/DefaultConfig.java | 4 ++-- .../redspace/ironsspellbooks/api/registry/SpellRegistry.java | 4 ++-- .../ironsspellbooks/entity/spells/sunbeam/Sunbeam.java | 2 +- .../ironsspellbooks/spells/holy/CloudOfRegenerationSpell.java | 2 +- .../io/redspace/ironsspellbooks/spells/holy/SunbeamSpell.java | 1 - .../redspace/ironsspellbooks/spells/ice/FrostbiteSpell.java | 1 - 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/redspace/ironsspellbooks/api/config/DefaultConfig.java b/src/main/java/io/redspace/ironsspellbooks/api/config/DefaultConfig.java index 01d3ef30d..a8c7b05ab 100644 --- a/src/main/java/io/redspace/ironsspellbooks/api/config/DefaultConfig.java +++ b/src/main/java/io/redspace/ironsspellbooks/api/config/DefaultConfig.java @@ -25,8 +25,8 @@ public DefaultConfig setMaxLevel(int i) { return this; } - public DefaultConfig setEnabled(boolean enabled) { - this.enabled = enabled; + public DefaultConfig setDeprecated(boolean deprecated) { + this.enabled = !deprecated; return this; } diff --git a/src/main/java/io/redspace/ironsspellbooks/api/registry/SpellRegistry.java b/src/main/java/io/redspace/ironsspellbooks/api/registry/SpellRegistry.java index 5ef41a4d0..74e5446e5 100644 --- a/src/main/java/io/redspace/ironsspellbooks/api/registry/SpellRegistry.java +++ b/src/main/java/io/redspace/ironsspellbooks/api/registry/SpellRegistry.java @@ -133,14 +133,14 @@ public static AbstractSpell getSpell(ResourceLocation resourceLocation) { public static final RegistryObject GUIDING_BOLT_SPELL = registerSpell(new GuidingBoltSpell()); public static final RegistryObject HEALING_CIRCLE_SPELL = registerSpell(new HealingCircleSpell()); public static final RegistryObject HEAL_SPELL = registerSpell(new HealSpell()); - public static final RegistryObject SUNBEAM_SPELL = registerSpell(new SunbeamSpell()); + //public static final RegistryObject SUNBEAM_SPELL = registerSpell(new SunbeamSpell()); public static final RegistryObject WISP_SPELL = registerSpell(new WispSpell()); public static final RegistryObject DIVINE_SMITE_SPELL = registerSpell(new DivineSmiteSpell()); public static final RegistryObject HASTE_SPELL = registerSpell(new HasteSpell()); // ICE public static final RegistryObject CONE_OF_COLD_SPELL = registerSpell(new ConeOfColdSpell()); - public static final RegistryObject FROSTBITE_SPELL = registerSpell(new FrostbiteSpell()); +// public static final RegistryObject FROSTBITE_SPELL = registerSpell(new FrostbiteSpell()); public static final RegistryObject FROST_STEP_SPELL = registerSpell(new FrostStepSpell()); public static final RegistryObject ICE_BLOCK_SPELL = registerSpell(new IceBlockSpell()); public static final RegistryObject ICICLE_SPELL = registerSpell(new IcicleSpell()); diff --git a/src/main/java/io/redspace/ironsspellbooks/entity/spells/sunbeam/Sunbeam.java b/src/main/java/io/redspace/ironsspellbooks/entity/spells/sunbeam/Sunbeam.java index 9f4e01307..842e4f4bd 100644 --- a/src/main/java/io/redspace/ironsspellbooks/entity/spells/sunbeam/Sunbeam.java +++ b/src/main/java/io/redspace/ironsspellbooks/entity/spells/sunbeam/Sunbeam.java @@ -46,7 +46,7 @@ public void tick() { @Override public void applyEffect(LivingEntity target) { - DamageSources.applyDamage(target, getDamage(), SpellRegistry.SUNBEAM_SPELL.get().getDamageSource(this, getOwner()), SpellRegistry.SUNBEAM_SPELL.get().getSchoolType()); +// DamageSources.applyDamage(target, getDamage(), SpellRegistry.SUNBEAM_SPELL.get().getDamageSource(this, getOwner())); } @Override diff --git a/src/main/java/io/redspace/ironsspellbooks/spells/holy/CloudOfRegenerationSpell.java b/src/main/java/io/redspace/ironsspellbooks/spells/holy/CloudOfRegenerationSpell.java index baf3bcbd2..6699f117e 100644 --- a/src/main/java/io/redspace/ironsspellbooks/spells/holy/CloudOfRegenerationSpell.java +++ b/src/main/java/io/redspace/ironsspellbooks/spells/holy/CloudOfRegenerationSpell.java @@ -41,7 +41,7 @@ public List getUniqueInfo(int spellLevel, LivingEntity caster) .setSchoolResource(SchoolRegistry.HOLY_RESOURCE) .setMaxLevel(5) .setCooldownSeconds(35) - .setEnabled(false) + .setDeprecated(true) .build(); public CloudOfRegenerationSpell() { diff --git a/src/main/java/io/redspace/ironsspellbooks/spells/holy/SunbeamSpell.java b/src/main/java/io/redspace/ironsspellbooks/spells/holy/SunbeamSpell.java index 9e02656f9..f9fba932b 100644 --- a/src/main/java/io/redspace/ironsspellbooks/spells/holy/SunbeamSpell.java +++ b/src/main/java/io/redspace/ironsspellbooks/spells/holy/SunbeamSpell.java @@ -38,7 +38,6 @@ public List getUniqueInfo(int spellLevel, LivingEntity caster) .setSchoolResource(SchoolRegistry.HOLY_RESOURCE) .setMaxLevel(10) .setCooldownSeconds(20) - .setEnabled(false) .build(); public SunbeamSpell() { diff --git a/src/main/java/io/redspace/ironsspellbooks/spells/ice/FrostbiteSpell.java b/src/main/java/io/redspace/ironsspellbooks/spells/ice/FrostbiteSpell.java index 37c3e23d1..09e12d852 100644 --- a/src/main/java/io/redspace/ironsspellbooks/spells/ice/FrostbiteSpell.java +++ b/src/main/java/io/redspace/ironsspellbooks/spells/ice/FrostbiteSpell.java @@ -44,7 +44,6 @@ public List getUniqueInfo(int spellLevel, LivingEntity caster) .setSchoolResource(SchoolRegistry.ICE_RESOURCE) .setMaxLevel(5) .setCooldownSeconds(0) - .setEnabled(true) .build(); public FrostbiteSpell() {