arg/scriptcraft
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

getting ready for working on 1.8

Browse source
This commit is contained in:
walterhiggins 2014-12-25 11:37:00 +00:00
parent fe46987d71
commit 4fd37054d9
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/js/plugins/drone/blocktype.js
View file

@ -326,17 +326,7 @@ for ( c in bitmaps.raw ) {
} }
} }
} }
function blocktype( message, fg, bg ) {
//
// message
// string with text to be displayed
// fg
// foreground material. The material the text will be in.
// bg
// background material, optional. The negative space within the bounding box of the text.
//
Drone.extend('blocktype', function( message, fg, bg ) {
var bmfg, var bmfg,
bmbg, bmbg,
@ -402,7 +392,8 @@ Drone.extend('blocktype', function( message, fg, bg ) {
} }
return this.move( 'blocktext' ); return this.move( 'blocktext' );
}); }
Drone.extend(blocktype);

3
src/main/js/plugins/drone/drone.js
View file

@ -578,6 +578,9 @@ function putBlock( x, y, z, blockId, metadata, world ) {
var block = world.getBlockAt( x, y, z ); var block = world.getBlockAt( x, y, z );
if ( block.typeId != blockId || block.data != metadata ) { if ( block.typeId != blockId || block.data != metadata ) {
if (__plugin.canary) { if (__plugin.canary) {
if (block.getProperties){
// TODO we are in 1.8
}
world.setBlockAt(x, y, z, blockId, metadata); world.setBlockAt(x, y, z, blockId, metadata);
return; return;
} }