Reworked getEntity; Hi instanceof, bay 16 classes

2011-01-30 16:15:17 +01:00
parent 75ba9a0f25
commit b2a0c5a2ae
32 changed files with 85 additions and 1797 deletions
--- a/src/main/java/net/minecraft/server/EntitySheep.java
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -1,100 +0,0 @@
-package net.minecraft.server;
-
-import java.util.Random;
-
-// CraftBukkit start
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftSheep;
-// CraftBukkit end
-
-public class EntitySheep extends EntityAnimal {
-
-    public static final float[][] a = new float[][] { { 1.0F, 1.0F, 1.0F}, { 0.95F, 0.7F, 0.2F}, { 0.9F, 0.5F, 0.85F}, { 0.6F, 0.7F, 0.95F}, { 0.9F, 0.9F, 0.2F}, { 0.5F, 0.8F, 0.1F}, { 0.95F, 0.7F, 0.8F}, { 0.3F, 0.3F, 0.3F}, { 0.6F, 0.6F, 0.6F}, { 0.3F, 0.6F, 0.7F}, { 0.7F, 0.4F, 0.9F}, { 0.2F, 0.4F, 0.8F}, { 0.5F, 0.4F, 0.3F}, { 0.4F, 0.5F, 0.2F}, { 0.8F, 0.3F, 0.3F}, { 0.1F, 0.1F, 0.1F}};
-
-    public EntitySheep(World world) {
-        super(world);
-        this.texture = "/mob/sheep.png";
-        this.a(0.9F, 1.3F);
-
-        // CraftBukkit start
-        CraftServer server = ((WorldServer) this.world).getServer();
-        this.bukkitEntity = new CraftSheep(server, this);
-        // CraftBukkit end
-    }
-
-    protected void a() {
-        super.a();
-        this.datawatcher.a(16, new Byte((byte) 0));
-    }
-
-    public boolean a(Entity entity, int i) {
-        if (!this.world.isStatic && !this.f_() && entity instanceof EntityLiving) {
-            this.a(true);
-            int j = 1 + this.random.nextInt(3);
-
-            for (int k = 0; k < j; ++k) {
-                EntityItem entityitem = this.a(new ItemStack(Block.WOOL.id, 1, this.e_()), 1.0F);
-
-                entityitem.motY += (double) (this.random.nextFloat() * 0.05F);
-                entityitem.motX += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F);
-                entityitem.motZ += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F);
-            }
-        }
-
-        return super.a(entity, i);
-    }
-
-    public void a(NBTTagCompound nbttagcompound) {
-        super.a(nbttagcompound);
-        nbttagcompound.a("Sheared", this.f_());
-        nbttagcompound.a("Color", (byte) this.e_());
-    }
-
-    public void b(NBTTagCompound nbttagcompound) {
-        super.b(nbttagcompound);
-        this.a(nbttagcompound.l("Sheared"));
-        this.a(nbttagcompound.b("Color"));
-    }
-
-    protected String e() {
-        return "mob.sheep";
-    }
-
-    protected String f() {
-        return "mob.sheep";
-    }
-
-    protected String g() {
-        return "mob.sheep";
-    }
-
-    public int e_() {
-        return this.datawatcher.a(16) & 15;
-    }
-
-    public void a(int i) {
-        byte b0 = this.datawatcher.a(16);
-
-        this.datawatcher.b(16, Byte.valueOf((byte) (b0 & 240 | i & 15)));
-    }
-
-    public boolean f_() {
-        return (this.datawatcher.a(16) & 16) != 0;
-    }
-
-    public void a(boolean flag) {
-        byte b0 = this.datawatcher.a(16);
-
-        if (flag) {
-            this.datawatcher.b(16, Byte.valueOf((byte) (b0 | 16)));
-        } else {
-            this.datawatcher.b(16, Byte.valueOf((byte) (b0 & -17)));
-        }
-    }
-
-    public static int a(Random random) {
-        int i = random.nextInt(100);
-
-        return i < 5 ? 15 : (i < 10 ? 7 : (i < 15 ? 8 : 0));
-    }
-}