Abstract Chargeable to a separate interface (#2558)

src/main/java/org/spongepowered/api/entity/Chargeable.java

@@ -0,0 +1,40 @@
+/*
+ * This file is part of SpongeAPI, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.api.entity;
+
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.data.value.Value;
+
+public interface Chargeable extends Entity {
+
+    /**
+     * {@link Keys#IS_CHARGED}
+     *
+     * @return Whether this entity is charged or not
+     */
+    default Value.Mutable<Boolean> charged() {
+        return this.requireValue(Keys.IS_CHARGED).asMutable();
+    }
+}

src/main/java/org/spongepowered/api/entity/living/monster/Creeper.java

@@ -24,26 +24,12 @@
  */
 package org.spongepowered.api.entity.living.monster;
 
-import org.spongepowered.api.data.Keys;
-import org.spongepowered.api.data.value.Value;
+import org.spongepowered.api.entity.Chargeable;
 import org.spongepowered.api.entity.explosive.fused.FusedExplosive;
 import org.spongepowered.api.entity.living.Monster;
 
 /**
  * Represents a Creeper.
  */
-public interface Creeper extends Monster, FusedExplosive {
-
-    /**
-     * {@link Keys#IS_CHARGED}
-     *
-     * <p>Note that "charged" creepers will likely
-     * cause larger than normal explosions.</p>
-     *
-     * @return Whether this creeper is charged or not
-     */
-    default Value.Mutable<Boolean> charged() {
-        return this.requireValue(Keys.IS_CHARGED).asMutable();
-    }
-
+public interface Creeper extends Monster, FusedExplosive, Chargeable {
 }

src/main/java/org/spongepowered/api/entity/living/monster/boss/Wither.java

@@ -27,6 +27,7 @@
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.ListValue;
 import org.spongepowered.api.entity.Aerial;
+import org.spongepowered.api.entity.Chargeable;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.explosive.fused.FusedExplosive;
 import org.spongepowered.api.entity.living.Monster;
@@ -35,7 +36,7 @@
 /**
  * Represents the Wither.
  */
-public interface Wither extends Monster, RangedAgent, Boss, Aerial, FusedExplosive {
+public interface Wither extends Monster, RangedAgent, Boss, Aerial, FusedExplosive, Chargeable {
 
     /**
      * {@link Keys#WITHER_TARGETS}