DamageSource/Type Changes

dropped all AbstractDamageSources
dropped all DamageSource subtypes

DamageTypes are now datapack registry types

Author: Faithcaio

…y/damage/source/common/package-info.java …nt/cause/entity/damage/DamageEffect.javasrc/main/java/org/spongepowered/api/event/cause/entity/damage/source/common/package-info.java renamed to src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffect.java src/main/java/org/spongepowered/api/event/cause/entity/damage/source/common/package-info.java renamed to src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffect.java

@@ -22,5 +22,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-@org.checkerframework.framework.qual.DefaultQualifier(org.checkerframework.checker.nullness.qual.NonNull.class)
-package org.spongepowered.api.event.cause.entity.damage.source.common;
+package org.spongepowered.api.event.cause.entity.damage;
+
+import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.util.annotation.CatalogedBy;
+
+
+@CatalogedBy(DamageEffects.class)
+public interface DamageEffect extends DefaultedRegistryValue {
+
+}

src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifierTypes.java

@@ -31,7 +31,7 @@
 import org.spongepowered.api.effect.potion.PotionEffectTypes;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.event.cause.entity.damage.source.FallingBlockDamageSource;
+import org.spongepowered.api.event.cause.entity.damage.source.DamageSource;
 import org.spongepowered.api.item.enchantment.Enchantment;
 import org.spongepowered.api.item.enchantment.EnchantmentType;
 import org.spongepowered.api.item.inventory.ItemStack;
@@ -112,7 +112,7 @@ public final class DamageModifierTypes {
 
     /**
      * Represents the {@link DamageModifier} that will modify damage from
-     * a {@link FallingBlockDamageSource}.
+     * a {@link DamageSource#source()} that is a {@link org.spongepowered.api.entity.FallingBlock}.
      *
      * <p>Usually, within the {@link DamageModifier#cause ()} will reside
      * an {@link ItemStackSnapshot} and an {@link Enchantment} signifying

…ty/damage/source/EntityDamageSource.java …t/cause/entity/damage/DamageScaling.javasrc/main/java/org/spongepowered/api/event/cause/entity/damage/source/EntityDamageSource.java renamed to src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScaling.java src/main/java/org/spongepowered/api/event/cause/entity/damage/source/EntityDamageSource.java renamed to src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScaling.java

@@ -22,42 +22,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.api.event.cause.entity.damage.source;
+package org.spongepowered.api.event.cause.entity.damage;
 
-import org.spongepowered.api.Sponge;
-import org.spongepowered.api.entity.Entity;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.util.annotation.CatalogedBy;
 
-public interface EntityDamageSource extends DamageSource {
 
-    /**
-     * Creates a new {@link Builder} for building an {@link EntityDamageSource}.
-     *
-     * @return A new builder
-     */
-    static Builder builder() {
-        return Sponge.game().builderProvider().provide(Builder.class);
-    }
+@CatalogedBy(DamageScalings.class)
+public interface DamageScaling extends DefaultedRegistryValue {
 
-    /**
-     * Gets the {@link Entity} that is the source.
-     *
-     * @return The entity source
-     */
-    Entity source();
-
-    interface Builder extends EntityDamageSourceBuilder<EntityDamageSource, Builder> {
-
-    }
-
-    interface EntityDamageSourceBuilder<T extends EntityDamageSource, B extends EntityDamageSourceBuilder<T, B>> extends DamageSourceBuilder<T, B> {
-
-        /**
-         * Sets the {@link Entity} as the damage "source".
-         *
-         * @param entity The entity
-         * @return This builder, for chaining
-         */
-        B entity(Entity entity);
-
-    }
 }

src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageType.java

@@ -24,22 +24,18 @@
  */
 package org.spongepowered.api.event.cause.entity.damage;
 
-import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.event.cause.entity.damage.source.DamageSource;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.tag.Tag;
 import org.spongepowered.api.util.Nameable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
- * A {@link DamageType} is a type of "grouping" for {@link DamageSource}s since
- * a {@link DamageSource} instance can be inherently different from another
- * {@link DamageSource} by virtue of the {@link Object} backing the source.
- * Furthermore, it is impossible to refer to {@link DamageSource}s statically
- * due to the nature of constructing them. It is possible however, that the
- * parent {@link Object} being referred to as the "damage source" can damage
- * an {@link Entity} with varying {@link DamageType}s depending on the
- * circumstances.
+ * A {@link DamageType} is a type of "grouping" for {@link DamageSource}s since a {@link DamageSource} instance can be inherently different from
+ * another {@link DamageSource} by virtue of the {@link Object} backing the source. Furthermore, it is impossible to refer to {@link DamageSource}s
+ * statically due to the nature of constructing them. It is possible however, that the parent {@link Object} being referred to as the "damage source"
+ * can damage an {@link Entity} with varying {@link DamageType}s depending on the circumstances.
  */
 @CatalogedBy(DamageTypes.class)
 public interface DamageType extends DefaultedRegistryValue, Nameable {
@@ -54,16 +50,37 @@ static Builder builder() {
     }
 
     /**
-     * A builder to create {@link DamageType}s.
+     * Gets the amount of exhaustion this {@link DamageType} will add to the entity, generally only to players.
+     * <p>
+     * TODO check this facts:
+     * <p>In vanilla gameplay this is set to 0.1 by default and
+     * overridden to 0 if the type is set to be absolute or
+     * as overriding armor.</p>
+     *
+     * @return The increase in exhaustion
      */
-    interface Builder extends org.spongepowered.api.util.Builder<DamageType, Builder> {
+    double exhaustion();
+
+    /**
+     * Checks whether this damage types matches a damage type tag.
+     *
+     * @param tag The tag to check.
+     * @return true if this damage type matches the damage type tag.
+     */
+    boolean is(Tag<DamageType> tag);
+
+    /**
+     * Returns the damage scaling.
+     *
+     * @return the damage scaling
+     */
+    DamageScaling scaling();
+
+    /**
+     * Returns the damage effect.
+     *
+     * @return the damage effect
+     */
+    DamageEffect effect();
 
-        /**
-         * Sets the name of the {@link DamageType}.
-         *
-         * @param name The name
-         * @return This builder, for chaining
-         */
-        Builder name(String name);
-    }
 }