Blob of cleaning

DenizenScript · Apr 19, 2016 · cbe06cb · cbe06cb
1 parent f348cff
commit cbe06cb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java
@@ -108,7 +108,7 @@ public dObject getContext(String name) {
         else if (name.equals("location")) {
             return location;
         }
-        else if (name.equals("cuboids")) { // NOTE: Deprecated in favour of context.location.cuboids
+        else if (name.equals("cuboids")) { // NOTE: Deprecated in favor of context.location.cuboids
             return cuboids;
         }
         return super.getContext(name);

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java
@@ -115,7 +115,7 @@ public dObject getContext(String name) {
         else if (name.equals("location")) {
             return location;
         }
-        else if (name.equals("cuboids")) { // NOTE: Deprecated in favour of context.location.cuboids
+        else if (name.equals("cuboids")) { // NOTE: Deprecated in favor of context.location.cuboids
             return cuboids;
         }
         else if (name.equals("reason")) {

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java
@@ -35,8 +35,8 @@
 // @Context
 // <context.entity> returns the dEntity the player is clicking at.
 // <context.item> returns the dItem the player is clicking with.
-// <context.cuboids> NOTE: DEPRECATED IN FAVOUR OF <context.location.cuboids>
-// <context.location> returns a dLocation on the entity that was clicked.
+// <context.cuboids> NOTE: DEPRECATED IN FAVOR OF <context.entity.location.cuboids>
+// <context.location> returns a dLocation on the entity that was clicked. NOTE: DEPRECATED IN FAVOR OF <context.entity.location>
 //
 // -->
 

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java
@@ -35,8 +35,8 @@
 // @Context
 // <context.entity> returns the dEntity the player is clicking on.
 // <context.item> returns the dItem the player is clicking with.
-// <context.cuboids> NOTE: DEPRECATED IN FAVOUR OF <context.location.cuboids>
-// <context.location> returns a dLocation of the clicked entity. NOTE: DEPRECATED IN FAVOUR OF <context.entity.location>
+// <context.cuboids> NOTE: DEPRECATED IN FAVOR OF <context.entity.location.cuboids>
+// <context.location> returns a dLocation of the clicked entity. NOTE: DEPRECATED IN FAVOR OF <context.entity.location>
 //
 // -->
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -28,10 +28,7 @@
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftAnimals;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftCreature;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R1.entity.*;
 import org.bukkit.entity.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
@@ -2095,7 +2092,7 @@ else if (!getLivingEntity().getActivePotionEffects().isEmpty()) {
         }
 
         // <--[tag]
-        // @attribute <e@entity.empty>
+        // @attribute <e@entity.is_empty>
         // @returns Element(Boolean)
         // @group attributes
         // @description
@@ -2107,7 +2104,7 @@ else if (!getLivingEntity().getActivePotionEffects().isEmpty()) {
         }
 
         // <--[tag]
-        // @attribute <e@entity.inside_vehicle>
+        // @attribute <e@entity.is_inside_vehicle>
         // @returns Element(Boolean)
         // @group attributes
         // @description
@@ -2119,7 +2116,7 @@ else if (!getLivingEntity().getActivePotionEffects().isEmpty()) {
         }
 
         // <--[tag]
-        // @attribute <e@entity.leashed>
+        // @attribute <e@entity.is_leashed>
         // @returns Element(Boolean)
         // @group attributes
         // @description
@@ -2137,7 +2134,7 @@ else if (!getLivingEntity().getActivePotionEffects().isEmpty()) {
         }
 
         // <--[tag]
-        // @attribute <e@entity.on_ground>
+        // @attribute <e@entity.is_on_ground>
         // @returns Element(Boolean)
         // @group attributes
         // @description
@@ -2149,7 +2146,7 @@ else if (!getLivingEntity().getActivePotionEffects().isEmpty()) {
         }
 
         // <--[tag]
-        // @attribute <e@entity.persistent>
+        // @attribute <e@entity.is_persistent>
         // @returns Element(Boolean)
         // @group attributes
         // @description

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemDye.java b/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemDye.java
@@ -73,7 +73,7 @@ public void adjust(Mechanism mechanism) {
 
         // <--[mechanism]
         // @object dItem
-        // @name dye_color
+        // @name dye
         // @input dColor
         // @description
         // Sets the leather armor item's dye color in the format RED,GREEN,BLUE