Remove WeatherEffect and duplicate keys methods

SpongePowered · Jun 28, 2024 · 4233b08 · 4233b08
1 parent 5f1bbba
commit 4233b08
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 58 deletions.
diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java
@@ -208,7 +208,6 @@
 import org.spongepowered.api.entity.vehicle.minecart.Minecart;
 import org.spongepowered.api.entity.vehicle.minecart.MinecartLike;
 import org.spongepowered.api.entity.weather.LightningBolt;
-import org.spongepowered.api.entity.weather.WeatherEffect;
 import org.spongepowered.api.event.cause.entity.damage.source.DamageSources;
 import org.spongepowered.api.fluid.FluidStackSnapshot;
 import org.spongepowered.api.fluid.FluidTypes;
@@ -1652,7 +1651,7 @@ public final class Keys {
     public static final Key<Value<Boolean>> IS_EATING = Keys.key(ResourceKey.sponge("is_eating"), Boolean.class);
 
     /**
-     * Whether a {@link WeatherEffect} like {@link LightningBolt} is harmful to other {@link Entity entities}.
+     * Whether a {@link LightningBolt} is harmful to other {@link Entity entities}.
      * Readonly
      */
     public static final Key<Value<Boolean>> IS_EFFECT_ONLY = Keys.key(ResourceKey.sponge("is_effect_only"), Boolean.class);

diff --git a/src/main/java/org/spongepowered/api/entity/weather/LightningBolt.java b/src/main/java/org/spongepowered/api/entity/weather/LightningBolt.java
@@ -26,12 +26,13 @@
 
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
+import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.util.Ticks;
 
 /**
  * Represents a Lighting Bolt.
  */
-public interface LightningBolt extends WeatherEffect {
+public interface LightningBolt extends Entity {
 
     /**
      * {@link Keys#DESPAWN_DELAY}

diff --git a/src/main/java/org/spongepowered/api/entity/weather/WeatherEffect.java b/src/main/java/org/spongepowered/api/entity/weather/WeatherEffect.java