Skip to content

Commit

Permalink
1.0.1 rename revision 1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dinnerbone
Dinnerbone committed Jan 12, 2012
1 parent e6e680a commit 349dda5
Show file tree
Hide file tree
Showing 63 changed files with 240 additions and 240 deletions.
2 changes: 1 addition & 1 deletion net/minecraft/server/AxisAlignedBB.java
View file
Expand Up @@ -84,7 +84,7 @@ public AxisAlignedBB a(double d0, double d1, double d2) {
return b(d3, d4, d5, d6, d7, d8);
}

public AxisAlignedBB b(double d0, double d1, double d2) {
public AxisAlignedBB grow(double d0, double d1, double d2) {
double d3 = this.a - d0;
double d4 = this.b - d1;
double d5 = this.c - d2;
Expand Down
2 changes: 1 addition & 1 deletion net/minecraft/server/BiomeBase.java
View file
Expand Up @@ -122,7 +122,7 @@ protected BiomeBase b(int i) {
return this;
}

public List a(EnumCreatureType enumcreaturetype) {
public List getMobs(EnumCreatureType enumcreaturetype) {
return enumcreaturetype == EnumCreatureType.MONSTER ? this.C : (enumcreaturetype == EnumCreatureType.CREATURE ? this.D : (enumcreaturetype == EnumCreatureType.WATER_CREATURE ? this.E : null));
}

Expand Down
4 changes: 2 additions & 2 deletions net/minecraft/server/Block.java
View file
Expand Up @@ -464,7 +464,7 @@ private boolean c(Vec3D vec3d) {
return vec3d == null ? false : vec3d.a >= this.minX && vec3d.a <= this.maxX && vec3d.b >= this.minY && vec3d.b <= this.maxY;
}

public void a_(World world, int i, int j, int k) {}
public void wasExploded(World world, int i, int j, int k) {}

public boolean canPlace(World world, int i, int j, int k, int l) {
return this.canPlace(world, i, j, k);
Expand Down Expand Up @@ -567,7 +567,7 @@ protected Block p() {
}

public int g() {
return this.material.l();
return this.material.getPushReaction();
}

static {
Expand Down
2 changes: 1 addition & 1 deletion net/minecraft/server/BlockDispenser.java
View file
Expand Up @@ -99,7 +99,7 @@ private void dispense(World world, int i, int j, int k, Random random) {
if (itemstack.id == Item.ARROW.id) {
EntityArrow entityarrow = new EntityArrow(world, d0, d1, d2);

entityarrow.a((double) b0, 0.10000000149011612D, (double) b1, 1.1F, 6.0F);
entityarrow.shoot((double) b0, 0.10000000149011612D, (double) b1, 1.1F, 6.0F);
entityarrow.fromPlayer = true;
world.addEntity(entityarrow);
world.f(1002, i, j, k, 0);
Expand Down
12 changes: 6 additions & 6 deletions net/minecraft/server/BlockJukeBox.java
View file
Expand Up @@ -14,7 +14,7 @@ public boolean interact(World world, int i, int j, int k, EntityHuman entityhuma
if (world.getData(i, j, k) == 0) {
return false;
} else {
this.c_(world, i, j, k);
this.dropRecord(world, i, j, k);
return true;
}
}
Expand All @@ -24,24 +24,24 @@ public void f(World world, int i, int j, int k, int l) {
TileEntityRecordPlayer tileentityrecordplayer = (TileEntityRecordPlayer) world.getTileEntity(i, j, k);

if (tileentityrecordplayer != null) {
tileentityrecordplayer.a = l;
tileentityrecordplayer.record = l;
tileentityrecordplayer.update();
world.setData(i, j, k, 1);
}
}
}

public void c_(World world, int i, int j, int k) {
public void dropRecord(World world, int i, int j, int k) {
if (!world.isStatic) {
TileEntityRecordPlayer tileentityrecordplayer = (TileEntityRecordPlayer) world.getTileEntity(i, j, k);

if (tileentityrecordplayer != null) {
int l = tileentityrecordplayer.a;
int l = tileentityrecordplayer.record;

if (l != 0) {
world.f(1005, i, j, k, 0);
world.a((String) null, i, j, k);
tileentityrecordplayer.a = 0;
tileentityrecordplayer.record = 0;
tileentityrecordplayer.update();
world.setData(i, j, k, 0);
float f = 0.7F;
Expand All @@ -58,7 +58,7 @@ public void c_(World world, int i, int j, int k) {
}

public void remove(World world, int i, int j, int k) {
this.c_(world, i, j, k);
this.dropRecord(world, i, j, k);
super.remove(world, i, j, k);
}

Expand Down
2 changes: 1 addition & 1 deletion net/minecraft/server/BlockPressurePlate.java
View file
Expand Up @@ -74,7 +74,7 @@ private void g(World world, int i, int j, int k) {
List list = null;

if (this.a == EnumMobType.EVERYTHING) {
list = world.b((Entity) null, AxisAlignedBB.b((double) ((float) i + f), (double) j, (double) ((float) k + f), (double) ((float) (i + 1) - f), (double) j + 0.25D, (double) ((float) (k + 1) - f)));
list = world.getEntities((Entity) null, AxisAlignedBB.b((double) ((float) i + f), (double) j, (double) ((float) k + f), (double) ((float) (i + 1) - f), (double) j + 0.25D, (double) ((float) (k + 1) - f)));
}

if (this.a == EnumMobType.MOBS) {
Expand Down
4 changes: 2 additions & 2 deletions net/minecraft/server/BlockStairs.java
View file
Expand Up @@ -125,8 +125,8 @@ public boolean interact(World world, int i, int j, int k, EntityHuman entityhuma
return this.a.interact(world, i, j, k, entityhuman);
}

public void a_(World world, int i, int j, int k) {
this.a.a_(world, i, j, k);
public void wasExploded(World world, int i, int j, int k) {
this.a.wasExploded(world, i, j, k);
}

public void postPlace(World world, int i, int j, int k, EntityLiving entityliving) {
Expand Down
2 changes: 1 addition & 1 deletion net/minecraft/server/BlockTNT.java
View file
Expand Up @@ -31,7 +31,7 @@ public int a(Random random) {
return 0;
}

public void a_(World world, int i, int j, int k) {
public void wasExploded(World world, int i, int j, int k) {
EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F));

entitytntprimed.fuseTicks = world.random.nextInt(entitytntprimed.fuseTicks / 4) + entitytntprimed.fuseTicks / 8;
Expand Down
12 changes: 6 additions & 6 deletions net/minecraft/server/ChunkProviderGenerate.java
View file
Expand Up @@ -183,7 +183,7 @@ public Chunk getOrCreateChunk(int i, int j) {
Chunk chunk = new Chunk(this.s, abyte, i, j);

this.a(i, j, abyte);
this.y = this.s.getWorldChunkManager().a(this.y, i * 16, j * 16, 16, 16);
this.y = this.s.getWorldChunkManager().getBiomeBlock(this.y, i * 16, j * 16, 16, 16);
this.a(i, j, abyte, this.y);
this.w.a(this, this.s, i, j, abyte);
this.x.a(this, this.s, i, j, abyte);
Expand Down Expand Up @@ -407,19 +407,19 @@ public boolean canSave() {
return true;
}

public List a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
public List getMobsFor(EnumCreatureType enumcreaturetype, int i, int j, int k) {
WorldChunkManager worldchunkmanager = this.s.getWorldChunkManager();

if (worldchunkmanager == null) {
return null;
} else {
BiomeBase biomebase = worldchunkmanager.a(new ChunkCoordIntPair(i >> 4, k >> 4));
BiomeBase biomebase = worldchunkmanager.getBiome(new ChunkCoordIntPair(i >> 4, k >> 4));

return biomebase == null ? null : biomebase.a(enumcreaturetype);
return biomebase == null ? null : biomebase.getMobs(enumcreaturetype);
}
}

public ChunkPosition a(World world, String s, int i, int j, int k) {
return "Stronghold".equals(s) && this.d != null ? this.d.a(world, i, j, k) : null;
public ChunkPosition findNearestMapFeature(World world, String s, int i, int j, int k) {
return "Stronghold".equals(s) && this.d != null ? this.d.getNearestGeneratedFeature(world, i, j, k) : null;
}
}
8 changes: 4 additions & 4 deletions net/minecraft/server/ChunkProviderHell.java
View file
Expand Up @@ -390,7 +390,7 @@ public boolean canSave() {
return true;
}

public List a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
public List getMobsFor(EnumCreatureType enumcreaturetype, int i, int j, int k) {
if (enumcreaturetype == EnumCreatureType.MONSTER && this.c.a(i, j, k)) {
return this.c.b();
} else {
Expand All @@ -399,14 +399,14 @@ public List a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
if (worldchunkmanager == null) {
return null;
} else {
BiomeBase biomebase = worldchunkmanager.a(new ChunkCoordIntPair(i >> 4, k >> 4));
BiomeBase biomebase = worldchunkmanager.getBiome(new ChunkCoordIntPair(i >> 4, k >> 4));

return biomebase == null ? null : biomebase.a(enumcreaturetype);
return biomebase == null ? null : biomebase.getMobs(enumcreaturetype);
}
}
}

public ChunkPosition a(World world, String s, int i, int j, int k) {
public ChunkPosition findNearestMapFeature(World world, String s, int i, int j, int k) {
return null;
}
}
8 changes: 4 additions & 4 deletions net/minecraft/server/ChunkProviderLoadOrGenerate.java
View file
Expand Up @@ -205,11 +205,11 @@ public boolean canSave() {
return true;
}

public List a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
return this.c.a(enumcreaturetype, i, j, k);
public List getMobsFor(EnumCreatureType enumcreaturetype, int i, int j, int k) {
return this.c.getMobsFor(enumcreaturetype, i, j, k);
}

public ChunkPosition a(World world, String s, int i, int j, int k) {
return this.c.a(world, s, i, j, k);
public ChunkPosition findNearestMapFeature(World world, String s, int i, int j, int k) {
return this.c.findNearestMapFeature(world, s, i, j, k);
}
}
8 changes: 4 additions & 4 deletions net/minecraft/server/ChunkProviderServer.java
View file
Expand Up @@ -189,11 +189,11 @@ public boolean canSave() {
return !this.world.savingDisabled;
}

public List a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
return this.chunkProvider.a(enumcreaturetype, i, j, k);
public List getMobsFor(EnumCreatureType enumcreaturetype, int i, int j, int k) {
return this.chunkProvider.getMobsFor(enumcreaturetype, i, j, k);
}

public ChunkPosition a(World world, String s, int i, int j, int k) {
return this.chunkProvider.a(world, s, i, j, k);
public ChunkPosition findNearestMapFeature(World world, String s, int i, int j, int k) {
return this.chunkProvider.findNearestMapFeature(world, s, i, j, k);
}
}
10 changes: 5 additions & 5 deletions net/minecraft/server/ChunkProviderTheEnd.java
View file
Expand Up @@ -138,7 +138,7 @@ public Chunk getOrCreateChunk(int i, int j) {
byte[] abyte = new byte[16 * this.m.height * 16];
Chunk chunk = new Chunk(this.m, abyte, i, j);

this.o = this.m.getWorldChunkManager().a(this.o, i * 16, j * 16, 16, 16);
this.o = this.m.getWorldChunkManager().getBiomeBlock(this.o, i * 16, j * 16, 16, 16);
this.a(i, j, abyte, this.o);
this.b(i, j, abyte, this.o);
chunk.initLighting();
Expand Down Expand Up @@ -283,19 +283,19 @@ public boolean canSave() {
return true;
}

public List a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
public List getMobsFor(EnumCreatureType enumcreaturetype, int i, int j, int k) {
WorldChunkManager worldchunkmanager = this.m.getWorldChunkManager();

if (worldchunkmanager == null) {
return null;
} else {
BiomeBase biomebase = worldchunkmanager.a(new ChunkCoordIntPair(i >> 4, k >> 4));
BiomeBase biomebase = worldchunkmanager.getBiome(new ChunkCoordIntPair(i >> 4, k >> 4));

return biomebase == null ? null : biomebase.a(enumcreaturetype);
return biomebase == null ? null : biomebase.getMobs(enumcreaturetype);
}
}

public ChunkPosition a(World world, String s, int i, int j, int k) {
public ChunkPosition findNearestMapFeature(World world, String s, int i, int j, int k) {
return null;
}
}
4 changes: 2 additions & 2 deletions net/minecraft/server/ConsoleCommandHandler.java
View file
Expand Up @@ -212,9 +212,9 @@ public synchronized void handle(ServerCommand servercommand) {
try {
k = Integer.parseInt(astring[2]);
k = WorldSettings.a(k);
if (entityplayer2.itemInWorldManager.a() != k) {
if (entityplayer2.itemInWorldManager.getGameMode() != k) {
this.print(s1, "Setting " + entityplayer2.name + " to game mode " + k);
entityplayer2.itemInWorldManager.a(k);
entityplayer2.itemInWorldManager.setGameMode(k);
entityplayer2.netServerHandler.sendPacket(new Packet70Bed(3, k));
} else {
this.print(s1, entityplayer2.name + " already has game mode " + k);
Expand Down
14 changes: 7 additions & 7 deletions net/minecraft/server/Entity.java
View file
Expand Up @@ -267,7 +267,7 @@ protected void ao() {

public boolean d(double d0, double d1, double d2) {
AxisAlignedBB axisalignedbb = this.boundingBox.c(d0, d1, d2);
List list = this.world.getEntities(this, axisalignedbb);
List list = this.world.a(this, axisalignedbb);

return list.size() > 0 ? false : !this.world.c(axisalignedbb);
}
Expand Down Expand Up @@ -303,7 +303,7 @@ public void move(double d0, double d1, double d2) {
if (flag) {
double d8;

for (d8 = 0.05D; d0 != 0.0D && this.world.getEntities(this, this.boundingBox.c(d0, -1.0D, 0.0D)).size() == 0; d5 = d0) {
for (d8 = 0.05D; d0 != 0.0D && this.world.a(this, this.boundingBox.c(d0, -1.0D, 0.0D)).size() == 0; d5 = d0) {
if (d0 < d8 && d0 >= -d8) {
d0 = 0.0D;
} else if (d0 > 0.0D) {
Expand All @@ -313,7 +313,7 @@ public void move(double d0, double d1, double d2) {
}
}

for (; d2 != 0.0D && this.world.getEntities(this, this.boundingBox.c(0.0D, -1.0D, d2)).size() == 0; d7 = d2) {
for (; d2 != 0.0D && this.world.a(this, this.boundingBox.c(0.0D, -1.0D, d2)).size() == 0; d7 = d2) {
if (d2 < d8 && d2 >= -d8) {
d2 = 0.0D;
} else if (d2 > 0.0D) {
Expand All @@ -324,7 +324,7 @@ public void move(double d0, double d1, double d2) {
}
}

List list = this.world.getEntities(this, this.boundingBox.a(d0, d1, d2));
List list = this.world.a(this, this.boundingBox.a(d0, d1, d2));

for (int i = 0; i < list.size(); ++i) {
d1 = ((AxisAlignedBB) list.get(i)).b(this.boundingBox, d1);
Expand Down Expand Up @@ -378,7 +378,7 @@ public void move(double d0, double d1, double d2) {
AxisAlignedBB axisalignedbb1 = this.boundingBox.clone();

this.boundingBox.b(axisalignedbb);
list = this.world.getEntities(this, this.boundingBox.a(d5, d1, d7));
list = this.world.a(this, this.boundingBox.a(d5, d1, d7));

for (k = 0; k < list.size(); ++k) {
d1 = ((AxisAlignedBB) list.get(k)).b(this.boundingBox, d1);
Expand Down Expand Up @@ -585,7 +585,7 @@ public boolean az() {
}

public boolean i_() {
return this.world.a(this.boundingBox.b(0.0D, -0.4000000059604645D, 0.0D).shrink(0.0010D, 0.0010D, 0.0010D), Material.WATER, this);
return this.world.a(this.boundingBox.grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.0010D, 0.0010D, 0.0010D), Material.WATER, this);
}

public boolean a(Material material) {
Expand All @@ -610,7 +610,7 @@ public float x() {
}

public boolean aA() {
return this.world.a(this.boundingBox.b(-0.10000000149011612D, -0.4000000059604645D, -0.10000000149011612D), Material.LAVA);
return this.world.a(this.boundingBox.grow(-0.10000000149011612D, -0.4000000059604645D, -0.10000000149011612D), Material.LAVA);
}

public void a(float f, float f1, float f2) {
Expand Down
8 changes: 4 additions & 4 deletions net/minecraft/server/EntityArrow.java
View file
Expand Up @@ -43,12 +43,12 @@ public EntityArrow(World world, EntityLiving entityliving, float f) {
this.motX = (double) (-MathHelper.sin(this.yaw / 180.0F * 3.1415927F) * MathHelper.cos(this.pitch / 180.0F * 3.1415927F));
this.motZ = (double) (MathHelper.cos(this.yaw / 180.0F * 3.1415927F) * MathHelper.cos(this.pitch / 180.0F * 3.1415927F));
this.motY = (double) (-MathHelper.sin(this.pitch / 180.0F * 3.1415927F));
this.a(this.motX, this.motY, this.motZ, f * 1.5F, 1.0F);
this.shoot(this.motX, this.motY, this.motZ, f * 1.5F, 1.0F);
}

protected void b() {}

public void a(double d0, double d1, double d2, float f, float f1) {
public void shoot(double d0, double d1, double d2, float f, float f1) {
float f2 = MathHelper.a(d0 * d0 + d1 * d1 + d2 * d2);

d0 /= (double) f2;
Expand Down Expand Up @@ -124,7 +124,7 @@ public void w_() {
}

Entity entity = null;
List list = this.world.b((Entity) this, this.boundingBox.a(this.motX, this.motY, this.motZ).b(1.0D, 1.0D, 1.0D));
List list = this.world.getEntities(this, this.boundingBox.a(this.motX, this.motY, this.motZ).grow(1.0D, 1.0D, 1.0D));
double d0 = 0.0D;

int k;
Expand All @@ -135,7 +135,7 @@ public void w_() {

if (entity1.e_() && (entity1 != this.shooter || this.l >= 5)) {
f1 = 0.3F;
AxisAlignedBB axisalignedbb1 = entity1.boundingBox.b((double) f1, (double) f1, (double) f1);
AxisAlignedBB axisalignedbb1 = entity1.boundingBox.grow((double) f1, (double) f1, (double) f1);
MovingObjectPosition movingobjectposition1 = axisalignedbb1.a(vec3d, vec3d1);

if (movingobjectposition1 != null) {
Expand Down
2 changes: 1 addition & 1 deletion net/minecraft/server/EntityBoat.java
View file
Expand Up @@ -267,7 +267,7 @@ public void w_() {

this.yaw = (float) ((double) this.yaw + d12);
this.c(this.yaw, this.pitch);
List list = this.world.b((Entity) this, this.boundingBox.b(0.20000000298023224D, 0.0D, 0.20000000298023224D));
List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
int l;

if (list != null && list.size() > 0) {
Expand Down
8 changes: 4 additions & 4 deletions net/minecraft/server/EntityComplexPart.java
View file
Expand Up @@ -2,13 +2,13 @@

public class EntityComplexPart extends Entity {

public final EntityComplex a;
public final EntityComplex owner;
public final String b;

public EntityComplexPart(EntityComplex entitycomplex, String s, float f, float f1) {
super(entitycomplex.world);
this.b(f, f1);
this.a = entitycomplex;
this.owner = entitycomplex;
this.b = s;
}

Expand All @@ -23,10 +23,10 @@ public boolean e_() {
}

public boolean damageEntity(DamageSource damagesource, int i) {
return this.a.a(this, damagesource, i);
return this.owner.a(this, damagesource, i);
}

public boolean a(Entity entity) {
return this == entity || this.a == entity;
return this == entity || this.owner == entity;
}
}

0 comments on commit 349dda5

Please sign in to comment.