* Async scheduler!

* Fixed an issue with fetching block information above max world height * Added toString overrides for all packets. * Implemented PlayerInteractEvent.
karlthepagan · Nov 19, 2011 · 7f09b77 · 7f09b77
1 parent e17b25e
commit 7f09b77
Show file tree

Hide file tree

Showing 82 changed files with 769 additions and 53 deletions.
diff --git a/pom.xml b/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.8.1-R4-SNAPSHOT</version>
+            <version>1.8.1-R5-SNAPSHOT</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
@@ -93,7 +93,12 @@
             <artifactId>junit</artifactId>
             <version>4.8.1</version>
             <scope>test</scope>
-    </dependency>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.trove4j</groupId>
+            <artifactId>trove4j</artifactId>
+            <version>3.0.1</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/java/net/glowstone/EventFactory.java b/src/main/java/net/glowstone/EventFactory.java
@@ -108,6 +108,10 @@ public static PlayerPreLoginEvent onPlayerPreLogin(String name, Session session)
     public static PlayerChangedWorldEvent onPlayerChangedWorld(GlowPlayer player, GlowWorld fromWorld) {
         return callEvent(new PlayerChangedWorldEvent(player, fromWorld));
     }
+
+    public static PlayerAnimationEvent onPlayerAnimate(GlowPlayer player) {
+        return callEvent(new PlayerAnimationEvent(player));
+    }
 
     // -- Block Events
 

diff --git a/src/main/java/net/glowstone/GlowChunk.java b/src/main/java/net/glowstone/GlowChunk.java
@@ -313,6 +313,7 @@ public void initializeTypes(byte[] types) {
      * @return A GlowBlockState if the entity exists, or null otherwise.
      */
     public GlowBlockState getEntity(int x, int y, int z) {
+        if (y >= world.getMaxHeight() - 1 || y < 0) return null;
         load();
         return tileEntities.get(coordToIndex(x, z, y));
     }
@@ -325,6 +326,7 @@ public GlowBlockState getEntity(int x, int y, int z) {
      * @return The type.
      */
     public int getType(int x, int z, int y) {
+        if (y >= world.getMaxHeight() - 1 || y < 0) return 0;
         load();
         return types[coordToIndex(x, z, y)];
     }
@@ -371,6 +373,7 @@ public void setType(int x, int z, int y, int type) {
      * @return The metadata.
      */
     public int getMetaData(int x, int z, int y) {
+        if (y >= world.getMaxHeight() - 1 || y < 0) return 0;
         load();
         return metaData[coordToIndex(x, z, y)];
     }
@@ -398,6 +401,7 @@ public void setMetaData(int x, int z, int y, int metaData) {
      * @return The sky light level.
      */
     public int getSkyLight(int x, int z, int y) {
+        if (y >= world.getMaxHeight() - 1 || y < 0) return 0;
         load();
         return skyLight[coordToIndex(x, z, y)];
     }
@@ -425,6 +429,7 @@ public void setSkyLight(int x, int z, int y, int skyLight) {
      * @return The block light level.
      */
     public int getBlockLight(int x, int z, int y) {
+        if (y >= world.getMaxHeight() - 1 || y < 0) return 0;
         load();
         return blockLight[coordToIndex(x, z, y)];
     }

diff --git a/src/main/java/net/glowstone/GlowWorld.java b/src/main/java/net/glowstone/GlowWorld.java
@@ -487,7 +487,7 @@ public synchronized GlowBlock getBlockAt(int x, int y, int z) {
     }
 
     public int getBlockTypeIdAt(int x, int y, int z) {
-        return ((GlowChunk) getChunkAt(x >> 4, z >> 4)).getType(x & 0xF, z & 0xF, y & 0x7F);
+        return ((GlowChunk) getChunkAt(x >> 4, z >> 4)).getType(x & 0xF, z & 0xF, y);
     }
 
     public int getHighestBlockYAt(int x, int z) {

diff --git a/src/main/java/net/glowstone/block/GlowBlock.java b/src/main/java/net/glowstone/block/GlowBlock.java
@@ -113,7 +113,7 @@ public Material getType() {
     }
 
     public int getTypeId() {
-        return chunk.getType(x & 0xf, z & 0xf, y & 0x7f);
+        return chunk.getType(x & 0xf, z & 0xf, y);
     }
 
     public void setType(Material type) {
@@ -129,8 +129,8 @@ public boolean setTypeId(int type, boolean applyPhysics) {
     }
 
     public boolean setTypeIdAndData(int type, byte data, boolean applyPhysics) {
-        chunk.setType(x & 0xf, z & 0xf, y & 0x7f, type);
-        chunk.setMetaData(x & 0xf, z & 0xf, y & 0x7f, data);
+        chunk.setType(x & 0xf, z & 0xf, y, type);
+        chunk.setMetaData(x & 0xf, z & 0xf, y, data);
 
         BlockChangeMessage bcmsg = new BlockChangeMessage(x, y, z, type, data);
         for (GlowPlayer p : getWorld().getRawPlayers()) {
@@ -151,7 +151,7 @@ public boolean isLiquid() {
     // data and light getters/setters
 
     public byte getData() {
-        return (byte) chunk.getMetaData(x & 0xf, z & 0xf, y & 0x7f);
+        return (byte) chunk.getMetaData(x & 0xf, z & 0xf, y);
     }
 
     public void setData(byte data) {
@@ -168,7 +168,7 @@ public void setData(byte data, boolean applyPhyiscs) {
     }
 
     public byte getLightLevel() {
-        return (byte) Math.max(chunk.getSkyLight(x & 0xf, z & 0xf, y & 0x7f), chunk.getBlockLight(x & 0xf, z & 0xf, y & 0x7f));
+        return (byte) Math.max(chunk.getSkyLight(x & 0xf, z & 0xf, y), chunk.getBlockLight(x & 0xf, z & 0xf, y));
     }
 
     // redstone-related shenanigans
@@ -202,4 +202,9 @@ public PistonMoveReaction getPistonMoveReaction() {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public String toString() {
+        return "GlowBlock{loc=" + getLocation().toString() + ",type=" + getTypeId() + ",data=" + getData() + "}";
+    }
+
 }
diff --git a/src/main/java/net/glowstone/entity/GlowLivingEntity.java b/src/main/java/net/glowstone/entity/GlowLivingEntity.java
@@ -1,10 +1,14 @@
 package net.glowstone.entity;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.ArrayList;
 import java.util.List;
+
+import gnu.trove.set.hash.TIntHashSet;
 import net.glowstone.GlowServer;
 
+import net.glowstone.util.TargetBlock;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Arrow;
@@ -24,7 +28,7 @@
 import net.glowstone.GlowWorld;
 
 /**
- * A GlowLivingEntity is a {@link Player} or {@link Monster}.
+ * A GlowLivingEntity is a {@link org.bukkit.entity.Player} or {@link org.bukkit.entity.Monster}.
  * @author Graham Edgecombe.
  */
 public abstract class GlowLivingEntity extends GlowEntity implements LivingEntity {
@@ -107,15 +111,53 @@ public Location getEyeLocation() {
     }
 
     public List<Block> getLineOfSight(HashSet<Byte> transparent, int maxDistance) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        TIntHashSet transparentBlocks = new TIntHashSet();
+        if (transparent != null) {
+            for (byte byt : transparent) {
+                transparentBlocks.add(byt);
+            }
+        } else {
+            transparentBlocks.add(0);
+        }
+        List<Block> ret = new ArrayList<Block>();
+        TargetBlock target = new TargetBlock(this, maxDistance, 0.2, transparentBlocks);
+        while (target.getNextBlock() != null) {
+            Block block = target.getCurrentBlock().getBlock();
+            if (!transparentBlocks.contains(block.getTypeId())) {
+                ret.add(block);
+            }
+        }
+        return ret;
     }
 
     public Block getTargetBlock(HashSet<Byte> transparent, int maxDistance) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        TIntHashSet transparentBlocks = new TIntHashSet();
+        if (transparent != null) {
+            for (byte byt : transparent) {
+                transparentBlocks.add(byt);
+            }
+        } else {
+            transparentBlocks = null;
+        }
+        Location loc = new TargetBlock(this, maxDistance, 0.2, transparentBlocks).getSolidTargetBlock();
+        return loc == null ? null : loc.getBlock();
     }
 
     public List<Block> getLastTwoTargetBlocks(HashSet<Byte> transparent, int maxDistance) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        TIntHashSet transparentBlocks = new TIntHashSet();
+        if (transparent != null) {
+            for (byte byt : transparent) {
+                transparentBlocks.add(byt);
+            }
+        } else {
+            transparentBlocks = null;
+        }
+        TargetBlock target = new TargetBlock(this, maxDistance, 0.2, transparentBlocks);
+        Location last = target.getSolidTargetBlock();
+        if (last == null) {
+            return new ArrayList<Block>(Arrays.asList(target.getPreviousBlock().getBlock()));
+        }
+        return new ArrayList<Block>(Arrays.asList(target.getPreviousBlock().getBlock(), last.getBlock()));
     }
 
     public Egg throwEgg() {

diff --git a/src/main/java/net/glowstone/entity/GlowPlayer.java b/src/main/java/net/glowstone/entity/GlowPlayer.java
@@ -131,6 +131,12 @@ public final class GlowPlayer extends GlowHumanEntity implements Player, Invento
      */
     private String playerListName;
 
+    /**
+     * Stores the last block placement message to work around a bug in the
+     * vanilla client where duplicate packets are sent.
+     */
+    private BlockPlacementMessage lastPlacement;
+
     /**
      * Creates a new player and adds it to the world.
      * @param session The player's session.
@@ -877,4 +883,12 @@ public Map<String, Object> serialize() {
         ret.put("name", getName());
         return ret;
     }
+
+    public BlockPlacementMessage getPreviousPlacement() {
+        return lastPlacement;
+    }
+
+    public void setPreviousPlacement(BlockPlacementMessage message) {
+        this.lastPlacement = message;
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/ActivateItemMessage.java b/src/main/java/net/glowstone/msg/ActivateItemMessage.java
@@ -12,4 +12,8 @@ public int getSlot() {
         return slot;
     }
 
+    @Override
+    public String toString() {
+        return "ActivateItemMessage{slot=" + slot + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/AnimateEntityMessage.java b/src/main/java/net/glowstone/msg/AnimateEntityMessage.java
@@ -21,4 +21,8 @@ public int getAnimation() {
         return animation;
     }
 
+    @Override
+    public String toString() {
+        return "AnimateEntityMessage{id=" + id + ",animation=" + animation + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/AttachEntityMessage.java b/src/main/java/net/glowstone/msg/AttachEntityMessage.java
@@ -17,4 +17,8 @@ public int getVehicle() {
         return vehicle;
     }
 
+    @Override
+    public String toString() {
+        return "AttachEntityMessage{id=" + id + ",vehicle=" + vehicle + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/BlockChangeMessage.java b/src/main/java/net/glowstone/msg/BlockChangeMessage.java
@@ -32,4 +32,8 @@ public int getMetadata() {
         return metadata;
     }
 
+    @Override
+    public String toString() {
+        return "BlockChangeMessage{x=" + x + ",y=" + y +",z=" + z + ",type=" + type + ",metadata=" + metadata + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/BlockPlacementMessage.java b/src/main/java/net/glowstone/msg/BlockPlacementMessage.java
@@ -46,4 +46,8 @@ public int getDirection() {
         return direction;
     }
 
+    @Override
+    public String toString() {
+        return "BlockPlacementMessage{x=" + x + ",y=" + y +",z=" + z + ",direction=" + direction + ",id=" + id + ",count=" + count + ",damage=" + damage + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/ChatMessage.java b/src/main/java/net/glowstone/msg/ChatMessage.java
@@ -12,4 +12,8 @@ public String getMessage() {
         return message;
     }
 
+    @Override
+    public String toString() {
+        return "ChatMessage{message=" + message + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/CloseWindowMessage.java b/src/main/java/net/glowstone/msg/CloseWindowMessage.java
@@ -12,4 +12,8 @@ public int getId() {
         return id;
     }
 
+    @Override
+    public String toString() {
+        return "CloseWindowMessage{id=" + id + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/CollectItemMessage.java b/src/main/java/net/glowstone/msg/CollectItemMessage.java
@@ -17,4 +17,8 @@ public int getCollector() {
         return collector;
     }
 
+    @Override
+    public String toString() {
+        return "CollectItemMessage{id=" + id + ",collector=" + collector + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/CompressedChunkMessage.java b/src/main/java/net/glowstone/msg/CompressedChunkMessage.java
@@ -45,4 +45,8 @@ public byte[] getData() {
         return data;
     }
 
+    @Override
+    public String toString() {
+    return "CompressedChunkMessage{x=" + x + ",y=" + y + ",z=" + z + ",width=" + width + ",height=" + height + ",depth=" + depth + ",data=" + depth + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/CreateEntityMessage.java b/src/main/java/net/glowstone/msg/CreateEntityMessage.java
@@ -12,4 +12,8 @@ public int getId() {
         return id;
     }
 
+    @Override
+    public String toString() {
+        return "CreateEntityMessage{id=" + id + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/DestroyEntityMessage.java b/src/main/java/net/glowstone/msg/DestroyEntityMessage.java
@@ -12,4 +12,8 @@ public int getId() {
         return id;
     }
 
+    @Override
+    public String toString() {
+        return "DestroyEntityMessage{id=" + id + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/DiggingMessage.java b/src/main/java/net/glowstone/msg/DiggingMessage.java
@@ -36,4 +36,8 @@ public int getFace() {
         return face;
     }
 
+    @Override
+    public String toString() {
+        return "DiggingMessage{state=" + state + ",x=" + x + ",y=" + y + ",z=" + z + ",face=" + face + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/EntityActionMessage.java b/src/main/java/net/glowstone/msg/EntityActionMessage.java
@@ -21,4 +21,8 @@ public int getAction() {
         return action;
     }
 
+    @Override
+    public String toString() {
+        return "EntityActionMessage{id=" + id + ",action=" + action + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/EntityEffectMessage.java b/src/main/java/net/glowstone/msg/EntityEffectMessage.java
@@ -28,5 +28,9 @@ public byte getAmplifier() {
     public short getDuration() {
         return duration;
     }
-
+
+    @Override
+    public String toString() {
+        return "EntityEffectMessage{id=" + id + ",effect=" + effect + ",amplifier=" + amplifier + ",duration=" + duration +"}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/EntityEquipmentMessage.java b/src/main/java/net/glowstone/msg/EntityEquipmentMessage.java
@@ -33,4 +33,8 @@ public int getDamage() {
         return damage;
     }
 
+    @Override
+    public String toString() {
+        return "EntityEquipmentMessage{id=" + id + ",slot=" + slot + ",item=" + item + ",damage" + damage +"}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/EntityInteractionMessage.java b/src/main/java/net/glowstone/msg/EntityInteractionMessage.java
@@ -23,4 +23,8 @@ public boolean isPunching() {
         return punching;
     }
 
+    @Override
+    public String toString() {
+        return "EntityInteractionMessage{id=" + id + ",target=" + target + ",punching=" + punching + "}";
+    }
 }
diff --git a/src/main/java/net/glowstone/msg/EntityMetadataMessage.java b/src/main/java/net/glowstone/msg/EntityMetadataMessage.java
@@ -22,4 +22,14 @@ public List<Parameter<?>> getParameters() {
         return parameters;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder build = new StringBuilder("EntityInteractionMessage{id=");
+        build.append(id).append(",metadata=[");
+        for (Parameter<?> param : parameters) {
+            build.append(param.toString()).append(",");
+        }
+        build.append("]}");
+        return build.toString();
+    }
 }