refac: наименование полей
This commit is contained in:
@@ -232,7 +232,7 @@ public class Block
|
|||||||
public float slipperiness;
|
public float slipperiness;
|
||||||
private String blockName;
|
private String blockName;
|
||||||
|
|
||||||
protected Block(int par1, Material par2Material)
|
protected Block(int id, Material par2Material)
|
||||||
{
|
{
|
||||||
blockConstructorCalled = true;
|
blockConstructorCalled = true;
|
||||||
enableStats = true;
|
enableStats = true;
|
||||||
@@ -240,19 +240,19 @@ public class Block
|
|||||||
blockParticleGravity = 1.0F;
|
blockParticleGravity = 1.0F;
|
||||||
slipperiness = 0.6F;
|
slipperiness = 0.6F;
|
||||||
|
|
||||||
if (blocksList[par1] != null)
|
if (blocksList[id] != null)
|
||||||
{
|
{
|
||||||
throw new IllegalArgumentException((new StringBuilder()).append("Slot ").append(par1).append(" is already occupied by ").append(blocksList[par1]).append(" when adding ").append(this).toString());
|
throw new IllegalArgumentException((new StringBuilder()).append("Slot ").append(id).append(" is already occupied by ").append(blocksList[id]).append(" when adding ").append(this).toString());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
blockMaterial = par2Material;
|
blockMaterial = par2Material;
|
||||||
blocksList[par1] = this;
|
blocksList[id] = this;
|
||||||
blockID = par1;
|
blockID = id;
|
||||||
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
|
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
|
||||||
opaqueCubeLookup[par1] = isOpaqueCube();
|
opaqueCubeLookup[id] = isOpaqueCube();
|
||||||
lightOpacity[par1] = isOpaqueCube() ? 255 : 0;
|
lightOpacity[id] = isOpaqueCube() ? 255 : 0;
|
||||||
canBlockGrass[par1] = !par2Material.getCanBlockGrass();
|
canBlockGrass[id] = !par2Material.getCanBlockGrass();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -275,9 +275,9 @@ public class Block
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Block(int par1, int par2, Material par3Material)
|
protected Block(int id, int par2, Material par3Material)
|
||||||
{
|
{
|
||||||
this(par1, par3Material);
|
this(id, par3Material);
|
||||||
blockIndexInTexture = par2;
|
blockIndexInTexture = par2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user