API8 Keys

Author: Faithcaio

src/main/java/org/spongepowered/api/block/entity/Banner.java

@@ -41,7 +41,7 @@ public interface Banner extends NameableBlockEntity {
      * @return The value for the base color
      */
     default Value.Mutable<DyeColor> baseColor() {
-        return this.requireValue(Keys.BANNER_BASE_COLOR).asMutable();
+        return this.requireValue(Keys.DYE_COLOR).asMutable();
     }
 
     /**

src/main/java/org/spongepowered/api/block/entity/carrier/Beacon.java

@@ -33,7 +33,7 @@
 /**
  * Represents a Beacon.
  *
- * <p>Beacons apply prescribed effects according to the {@link Keys#BEACON_PRIMARY_EFFECT}.
+ * <p>Beacons apply prescribed effects according to the {@link Keys#PRIMARY_EFFECT}.
  * Depending on the completed levels of the beacon, the effects may be applied
  * at a further range or shorter range.</p>
  */
@@ -54,7 +54,7 @@ public interface Beacon extends NameableCarrierBlockEntity {
      * @return The optional value for the primary potion effect
      */
     default Optional<Value.Mutable<PotionEffectType>> primaryEffect() {
-        return this.getValue(Keys.BEACON_PRIMARY_EFFECT).map(Value::asMutable);
+        return this.getValue(Keys.PRIMARY_EFFECT).map(Value::asMutable);
     }
 
     /**
@@ -64,7 +64,7 @@ default Optional<Value.Mutable<PotionEffectType>> primaryEffect() {
      * @return The optional value for the secondary potion effect
      */
     default Optional<Value.Mutable<PotionEffectType>> secondaryEffect() {
-        return this.getValue(Keys.BEACON_SECONDARY_EFFECT).map(Value::asMutable);
+        return this.getValue(Keys.SECONDARY_EFFECT).map(Value::asMutable);
     }
 
 }

src/main/java/org/spongepowered/api/block/entity/carrier/BrewingStand.java

@@ -26,7 +26,6 @@
 
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.BoundedValue;
-import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.item.ItemTypes;
 
 /**
@@ -35,14 +34,14 @@
 public interface BrewingStand extends NameableCarrierBlockEntity {
 
     /**
-     * {@link Keys#BREWING_STAND_FUEL}
+     * {@link Keys#FUEL}
      *
      * <p>Note 1 {@link ItemTypes#BLAZE_POWDER} supplies 20 fuel</p>
      *
      * @return The amount of fuel left in the brewing stand.
      */
     default BoundedValue.Mutable<Integer> fuel() {
-        return this.requireValue(Keys.BREWING_STAND_FUEL).asMutable();
+        return this.requireValue(Keys.FUEL).asMutable();
     }
 
     /**

src/main/java/org/spongepowered/api/block/entity/carrier/furnace/FurnaceBlockEntity.java

@@ -42,12 +42,12 @@ public interface FurnaceBlockEntity extends NameableCarrierBlockEntity {
     boolean process();
 
     /**
-     * Gets the {@link org.spongepowered.api.data.value.BoundedValue.Mutable} for the already passed burn time.
+     * Gets the {@link org.spongepowered.api.data.value.BoundedValue.Mutable} for the remaining fuel.
      *
-     * @return The value for the already passed burn time
+     * @return The value for the remaining fuel
      */
-    default BoundedValue.Mutable<Integer> passedBurnTime() {
-        return this.requireValue(Keys.PASSED_BURN_TIME).asMutable();
+    default BoundedValue.Mutable<Integer> remainingFuel() {
+        return this.requireValue(Keys.FUEL).asMutable();
     }
 
     /**

src/main/java/org/spongepowered/api/data/Keys.java

@@ -29,7 +29,6 @@
 import org.spongepowered.api.data.value.ListValue;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.effect.particle.ParticleEffect;
-import org.spongepowered.api.effect.particle.ParticleType;
 import org.spongepowered.api.effect.potion.PotionEffect;
 import org.spongepowered.api.util.Color;
 
@@ -40,76 +39,76 @@
 public interface AreaEffectCloud extends Entity {
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_COLOR}
+     * {@link Keys#COLOR}
      * @return The color of this cloud
      */
     default Value.Mutable<Color> color() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_COLOR).asMutable();
+        return this.requireValue(Keys.COLOR).asMutable();
     }
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_RADIUS}
+     * {@link Keys#RADIUS}
      * @return The initial radius of this cloud
      */
     default BoundedValue.Mutable<Double> radius() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_RADIUS).asMutable();
+        return this.requireValue(Keys.RADIUS).asMutable();
     }
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_PARTICLE_EFFECT}
+     * {@link Keys#PARTICLE_EFFECT}
      * @return The particle type
      * @see org.spongepowered.api.effect.particle.ParticleTypes
      */
     default Value.Mutable<ParticleEffect> particleEffect() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_PARTICLE_EFFECT).asMutable();
+        return this.requireValue(Keys.PARTICLE_EFFECT).asMutable();
     }
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_DURATION}
+     * {@link Keys#DURATION}
      * @return The duration of which this cloud will linger
      */
     default BoundedValue.Mutable<Integer> duration() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_DURATION).asMutable();
+        return this.requireValue(Keys.DURATION).asMutable();
     }
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_WAIT_TIME}
+     * {@link Keys#WAIT_TIME}
      * @return The wait time before applying to an entity
      */
     default BoundedValue.Mutable<Integer> waitTime() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_WAIT_TIME).asMutable();
+        return this.requireValue(Keys.WAIT_TIME).asMutable();
     }
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_RADIUS_ON_USE}
+     * {@link Keys#RADIUS_ON_USE}
      * @return The radius decrease per use
      */
     default BoundedValue.Mutable<Double> radiusOnUse() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_RADIUS_ON_USE).asMutable();
+        return this.requireValue(Keys.RADIUS_ON_USE).asMutable();
     }
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_RADIUS_PER_TICK}
+     * {@link Keys#RADIUS_PER_TICK}
      * @return The radius decrease per tick
      */
     default BoundedValue.Mutable<Double> radiusPerTick() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_RADIUS_PER_TICK).asMutable();
+        return this.requireValue(Keys.RADIUS_PER_TICK).asMutable();
     }
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_DURATION_ON_USE}
+     * {@link Keys#DURATION_ON_USE}
      * @return The duration of the potion effects when an entity gets a potion applied
      */
     default BoundedValue.Mutable<Integer> durationOnUse() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_DURATION_ON_USE).asMutable();
+        return this.requireValue(Keys.DURATION_ON_USE).asMutable();
     }
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_REAPPLICATION_DELAY}
+     * {@link Keys#REAPPLICATION_DELAY}
      * @return The delay for an entity to have a potion effect applied while standing in this cloud
      */
     default BoundedValue.Mutable<Integer> applicationDelay() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_REAPPLICATION_DELAY).asMutable();
+        return this.requireValue(Keys.REAPPLICATION_DELAY).asMutable();
     }
 
     /**
@@ -121,11 +120,11 @@ default ListValue.Mutable<PotionEffect> effects() {
     }
 
     /**
-     * {@link Keys#AREA_EFFECT_CLOUD_AGE}
+     * {@link Keys#AGE}
      * @return The age of this cloud
      */
     default BoundedValue.Mutable<Integer> age() {
-        return this.requireValue(Keys.AREA_EFFECT_CLOUD_AGE).asMutable();
+        return this.requireValue(Keys.AGE).asMutable();
     }
 
 }

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

@@ -54,7 +54,7 @@ default Value.Mutable<Double> damagePerBlock() {
      * {@link Keys#MAX_FALL_DAMAGE}
      * @return The maximum fall damage
      */
-    default Value.Mutable<Double> maxFallDamage() {
+    default Value.Mutable<Integer> maxFallDamage() {
         return this.requireValue(Keys.MAX_FALL_DAMAGE).asMutable();
     }
 

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

@@ -36,11 +36,11 @@
 public interface EnderCrystal extends Explosive {
 
     /**
-     * {@link Keys#BEAM_TARGET_POSITION}
+     * {@link Keys#TARGET_POSITION}
      * @return The target position of the beam
      */
     default Optional<Value.Mutable<Vector3i>> beamTarget() {
-        return this.getValue(Keys.BEAM_TARGET_POSITION).map(Value::asMutable);
+        return this.getValue(Keys.TARGET_POSITION).map(Value::asMutable);
     }
 
     /**

src/main/java/org/spongepowered/api/entity/explosive/EnderCrystal.java

@@ -39,7 +39,7 @@ public interface Explosive extends Entity {
      * {@link Keys#EXPLOSION_RADIUS}
      * @return The explosion radius
      */
-    default Optional<Value.Mutable<Double>> explosionRadius() {
+    default Optional<Value.Mutable<Integer>> explosionRadius() {
         return this.getValue(Keys.EXPLOSION_RADIUS).map(Value::asMutable);
     }
 

src/main/java/org/spongepowered/api/entity/explosive/Explosive.java

@@ -24,21 +24,9 @@
  */
 package org.spongepowered.api.entity.hanging;
 
-import org.spongepowered.api.data.Keys;
-import org.spongepowered.api.data.value.Value;
-import org.spongepowered.api.entity.Entity;
-
 /**
  * Represents a tied end of a leash on a block, like a fence post.
  */
 public interface LeashKnot extends Hanging {
 
-    /**
-     * {@link Keys#LEASHED_ENTITY}
-     * @return The leashed entity
-     */
-    default Value.Immutable<Entity> leashedEntity() {
-        return this.requireValue(Keys.LEASHED_ENTITY).asImmutable();
-    }
-
 }