From 2f2063b525e9f409104fb7575148421aab691778 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Sun, 20 Oct 2013 18:59:32 -0700 Subject: [PATCH] Adjust meta, add meta, formatting... --- .../aufdemrand/denizen/objects/Mechanism.java | 2 +- .../aufdemrand/denizen/objects/dChunk.java | 45 +++++++++++++++++++ .../denizen/objects/properties/EntityAge.java | 2 +- .../objects/properties/EntityFramed.java | 10 ++--- 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/objects/Mechanism.java b/src/main/java/net/aufdemrand/denizen/objects/Mechanism.java index 8cb52fab32..1d01fc35fe 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/Mechanism.java +++ b/src/main/java/net/aufdemrand/denizen/objects/Mechanism.java @@ -24,4 +24,4 @@ public boolean fulfilled() { return fulfilled; } -} \ No newline at end of file +} diff --git a/src/main/java/net/aufdemrand/denizen/objects/dChunk.java b/src/main/java/net/aufdemrand/denizen/objects/dChunk.java index 5187ec9f19..3c2a474f4a 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dChunk.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dChunk.java @@ -281,26 +281,71 @@ public String getAttribute(Attribute attribute) { @Override public void adjust(Mechanism mechanism, Element value) { + // <--[mechanism] + // @object dChunk + // @name unload + // @input None + // @description + // Removes a chunk from memory. + // @tags + // + // --> if (mechanism.matches("unload")) { unload(true); return; } + // <--[mechanism] + // @object dChunk + // @name unload_safely + // @input None + // @description + // Removes a chunk from memory in a safe manner. + // @tags + // + // --> if (mechanism.matches("unload_safely")) { unload(true, true); return; } + // <--[mechanism] + // @object dChunk + // @name unload_without_saving + // @input None + // @description + // Removes a chunk from memory without saving any recent changes. + // @tags + // + // --> if (mechanism.matches("unload_without_saving")) { unload(false); return; } + // <--[mechanism] + // @object dChunk + // @name unload + // @input None + // @description + // Loads a chunk into memory. + // @tags + // + // --> if (mechanism.matches("load")) { load(true); return; } + // <--[mechanism] + // @object dChunk + // @name regenerate + // @input None + // @description + // Causes the chunk to be entirely deleted and reformed from the world's seed. + // @tags + // None + // --> if (mechanism.matches("regenerate")) { getWorld().regenerateChunk(getX(), getZ()); return; diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/EntityAge.java b/src/main/java/net/aufdemrand/denizen/objects/properties/EntityAge.java index 055e538b72..a64054ad29 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/properties/EntityAge.java +++ b/src/main/java/net/aufdemrand/denizen/objects/properties/EntityAge.java @@ -70,7 +70,7 @@ public void setAge(int val) { } else { if (ageable.getBukkitEntity().getType() == EntityType.ZOMBIE) - ((Zombie) ageable.getBukkitEntity()).setBaby(val < 1 ? false : true); + ((Zombie) ageable.getBukkitEntity()).setBaby(val >= 1); else ((Ageable) ageable.getBukkitEntity()).setAge(val); } diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/EntityFramed.java b/src/main/java/net/aufdemrand/denizen/objects/properties/EntityFramed.java index fe3a27e4b1..7dcda04674 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/properties/EntityFramed.java +++ b/src/main/java/net/aufdemrand/denizen/objects/properties/EntityFramed.java @@ -76,20 +76,20 @@ public String getAttribute(Attribute attribute) { if (attribute == null) return "null"; // <--[tag] - // @attribute + // @attribute // @returns dItem // @description - // returns the material currently framed if the entity is an item frame. + // If the entity is an item frame, returns the material currently framed. // --> if (attribute.startsWith("framed_item")) return getItem() .getAttribute(attribute.fulfill(1)); // <--[tag] - // @attribute + // @attribute // @returns Element(Boolean) // @description - // returns true if the entity is an item frame that has an item. + // If the entity is an item frame, returns whether the frame has an item in it. // --> if (attribute.startsWith("has_framed_item")) return new Element(hasItem()) @@ -99,7 +99,7 @@ public String getAttribute(Attribute attribute) { // @attribute // @returns Element // @description - // returns the rotation of the material currently framed if the entity is an item frame. + // If the entity is an item frame, returns the rotation of the material currently framed. // --> if (attribute.startsWith("framed_item_rotation")) return new Element(getItemFrameEntity().getRotation().name().toLowerCase())