remove frostbite and sunbeam

iron431 · Dec 21, 2023 · 615adf1 · 615adf1
1 parent fc092e6
commit 615adf1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 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
@@ -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
@@ -133,14 +133,14 @@ public static AbstractSpell getSpell(ResourceLocation resourceLocation) {
     public static final RegistryObject<AbstractSpell> GUIDING_BOLT_SPELL = registerSpell(new GuidingBoltSpell());
     public static final RegistryObject<AbstractSpell> HEALING_CIRCLE_SPELL = registerSpell(new HealingCircleSpell());
     public static final RegistryObject<AbstractSpell> HEAL_SPELL = registerSpell(new HealSpell());
-    public static final RegistryObject<AbstractSpell> SUNBEAM_SPELL = registerSpell(new SunbeamSpell());
+    //public static final RegistryObject<AbstractSpell> SUNBEAM_SPELL = registerSpell(new SunbeamSpell());
     public static final RegistryObject<AbstractSpell> WISP_SPELL = registerSpell(new WispSpell());
     public static final RegistryObject<AbstractSpell> DIVINE_SMITE_SPELL = registerSpell(new DivineSmiteSpell());
     public static final RegistryObject<AbstractSpell> HASTE_SPELL = registerSpell(new HasteSpell());
 
     // ICE
     public static final RegistryObject<AbstractSpell> CONE_OF_COLD_SPELL = registerSpell(new ConeOfColdSpell());
-    public static final RegistryObject<AbstractSpell> FROSTBITE_SPELL = registerSpell(new FrostbiteSpell());
+//    public static final RegistryObject<AbstractSpell> FROSTBITE_SPELL = registerSpell(new FrostbiteSpell());
     public static final RegistryObject<AbstractSpell> FROST_STEP_SPELL = registerSpell(new FrostStepSpell());
     public static final RegistryObject<AbstractSpell> ICE_BLOCK_SPELL = registerSpell(new IceBlockSpell());
     public static final RegistryObject<AbstractSpell> 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
@@ -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
@@ -41,7 +41,7 @@ public List<MutableComponent> 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
@@ -38,7 +38,6 @@ public List<MutableComponent> 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
@@ -44,7 +44,6 @@ public List<MutableComponent> getUniqueInfo(int spellLevel, LivingEntity caster)
             .setSchoolResource(SchoolRegistry.ICE_RESOURCE)
             .setMaxLevel(5)
             .setCooldownSeconds(0)
-            .setEnabled(true)
             .build();
 
     public FrostbiteSpell() {