Skip to content

Commit 8ac7902

Browse files
arprussarpruss
committed
misc
1 parent a352d2b commit 8ac7902

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+136
-107
lines changed

‎blockly_uncompressed.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎blocks/minecraft.js‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,24 @@ Blockly.Blocks['minecraft_turtle_roll'] = {
267267
}
268268
};
269269

270-
Blockly.Blocks['minecraft_turtle_set_pen'] = {
270+
Blockly.Blocks['minecraft_turtle_pen_width'] = {
271271
init: function() {
272272
this.appendValueInput("WIDTH")
273273
.setCheck("Number")
274274
.appendField("Set pen width to");
275+
this.setInputsInline(true);
276+
this.setPreviousStatement(true);
277+
this.setNextStatement(true);
278+
this.setColour(Blockly.Blocks.MinecraftHue);
279+
this.setTooltip('');
280+
this.setHelpUrl('github.com/arpruss/raspberryjammod');
281+
}
282+
};
283+
284+
Blockly.Blocks['minecraft_turtle_pen_block'] = {
285+
init: function() {
275286
this.appendDummyInput()
276-
.appendField("and block to");
287+
.appendField("Set pen block to");
277288
this.appendDummyInput()
278289
.appendField(new Blockly.FieldDropdown(Blockly.Blocks.MinecraftBlocks), "BLOCK");
279290
this.setInputsInline(true);

‎blocks_compressed.js‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generators/javascript/minecraft.js‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,13 @@ Blockly.JavaScript.minecraft = function() {
224224
"MCPI.socket.onopen = function(event) {\n"+
225225
" MCPI.socket.onmessage = function(event) {\n"+
226226
" var args = event.data.trim().split(\",\");\n"+
227-
" MCPI.playerX = parseFloat(args[0]);\n"+
228-
" MCPI.playerY = parseFloat(args[1]);\n"+
229-
" MCPI.playerZ = parseFloat(args[2]);\n"+
227+
" MCPI.playerX = Math.floor(parseFloat(args[0]));\n"+
228+
" MCPI.playerY = Math.floor(parseFloat(args[1]));\n"+
229+
" MCPI.playerZ = Math.floor(parseFloat(args[2]));\n"+
230230
" MCPI.curX = MCPI.playerX;\n"+
231231
" MCPI.curY = MCPI.playerY;\n"+
232232
" MCPI.curZ = MCPI.playerZ;\n"+
233-
" MCPI.playerShiftedHeight = Math.floor(MCPI.playerY);\n"+
233+
" MCPI.playerShiftedHeight = MCPI.playerY;\n"+
234234
"\n"+
235235
" MCPI.socket.onmessage = function(event) {\n"+
236236
" var yaw = parseFloat(event.data.trim());\n"+
@@ -250,10 +250,10 @@ Blockly.JavaScript['minecraft_set_block'] = function(block) {
250250
Blockly.JavaScript.minecraft();
251251

252252
var dropdown_block = block.getFieldValue('BLOCK');
253-
var value_x = Blockly.JavaScript.valueToCode(block, 'x', Blockly.JavaScript.ORDER_ATOMIC);
254-
var value_y = Blockly.JavaScript.valueToCode(block, 'y', Blockly.JavaScript.ORDER_ATOMIC);
255-
var value_z = Blockly.JavaScript.valueToCode(block, 'z', Blockly.JavaScript.ORDER_ATOMIC);
256-
var code = 'MCPI.setBlock('+value_x+','+value_y+','+value_z+',"'+dropdown_block+'");\n';
253+
var value_x = Blockly.JavaScript.valueToCode(block, 'x', Blockly.JavaScript.ORDER_ADDITION);
254+
var value_y = Blockly.JavaScript.valueToCode(block, 'y', Blockly.JavaScript.ORDER_ADDITION);
255+
var value_z = Blockly.JavaScript.valueToCode(block, 'z', Blockly.JavaScript.ORDER_ADDITION);
256+
var code = 'MCPI.setBlock('+value_x+'+MCPI.playerX,'+value_y+'+MCPI.playerY,'+value_z+'+MCPI.playerZ,"'+dropdown_block+'");\n';
257257
return code;
258258
};
259259

@@ -274,33 +274,38 @@ Blockly.JavaScript['minecraft_post_to_chat'] = function(block) {
274274
Blockly.JavaScript['minecraft_turtle_yaw'] = function(block) {
275275
Blockly.JavaScript.minecraft();
276276
var dropdown_direction = block.getFieldValue('DIRECTION');
277-
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_ATOMIC);
278-
var code = 'MCPI.turtleYaw(('+value_angle+')*'+dropdown_direction+');\n';
277+
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_MULTIPLICATION);
278+
var code = 'MCPI.turtleYaw('+value_angle+'*'+dropdown_direction+');\n';
279279
return code;
280280
};
281281

282282
Blockly.JavaScript['minecraft_turtle_pitch'] = function(block) {
283283
Blockly.JavaScript.minecraft();
284284
var dropdown_direction = block.getFieldValue('DIRECTION');
285-
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_ATOMIC);
286-
var code = 'MCPI.turtlePitch(('+value_angle+')*'+dropdown_direction+');\n';
285+
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_MULTIPLICATION);
286+
var code = 'MCPI.turtlePitch('+value_angle+'*'+dropdown_direction+');\n';
287287
return code;
288288
};
289289

290290
Blockly.JavaScript['minecraft_turtle_roll'] = function(block) {
291291
Blockly.JavaScript.minecraft();
292292
var dropdown_direction = block.getFieldValue('DIRECTION');
293-
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_ATOMIC);
294-
var code = 'MCPI.turtleRoll(('+value_angle+')*'+dropdown_direction+');\n';
293+
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_MULTIPLICATION);
294+
var code = 'MCPI.turtleRoll('+value_angle+'*'+dropdown_direction+');\n';
295295
return code;
296296
};
297297

298-
Blockly.JavaScript['minecraft_turtle_set_pen'] = function(block) {
298+
Blockly.JavaScript['minecraft_turtle_pen_block'] = function(block) {
299299
Blockly.JavaScript.minecraft();
300-
var value_width = Blockly.JavaScript.valueToCode(block, 'WIDTH', Blockly.JavaScript.ORDER_ATOMIC);
301300
var dropdown_block = block.getFieldValue('BLOCK');
302-
var code = 'MCPI.turtleSetWidth('+value_width+');\n'+
303-
'MCPI.block = "'+dropdown_block+'";\n';
301+
var code = 'MCPI.block = "'+dropdown_block+'";\n';
302+
return code;
303+
};
304+
305+
Blockly.JavaScript['minecraft_turtle_pen_width'] = function(block) {
306+
Blockly.JavaScript.minecraft();
307+
var value_width = Blockly.JavaScript.valueToCode(block, 'WIDTH', Blockly.JavaScript.ORDER_ATOMIC);
308+
var code = 'MCPI.turtleSetWidth('+value_width+');\n';
304309
return code;
305310
};
306311

‎generators/javascript/source/mcinit.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,13 @@ MCPI.timerID = setTimeout(MCPI.timeoutFunction, 5000);
223223
MCPI.socket.onopen = function(event) {
224224
MCPI.socket.onmessage = function(event) {
225225
var args = event.data.trim().split(",");
226-
MCPI.playerX = parseFloat(args[0]);
227-
MCPI.playerY = parseFloat(args[1]);
228-
MCPI.playerZ = parseFloat(args[2]);
226+
MCPI.playerX = Math.floor(parseFloat(args[0]));
227+
MCPI.playerY = Math.floor(parseFloat(args[1]));
228+
MCPI.playerZ = Math.floor(parseFloat(args[2]));
229229
MCPI.curX = MCPI.playerX;
230230
MCPI.curY = MCPI.playerY;
231231
MCPI.curZ = MCPI.playerZ;
232-
MCPI.playerShiftedHeight = Math.floor(MCPI.playerY);
232+
MCPI.playerShiftedHeight = MCPI.playerY;
233233

234234
MCPI.socket.onmessage = function(event) {
235235
var yaw = parseFloat(event.data.trim());

‎generators/javascript/source/minecraft-in.js‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Blockly.JavaScript['minecraft_set_block'] = function(block) {
77
Blockly.JavaScript.minecraft();
88

99
var dropdown_block = block.getFieldValue('BLOCK');
10-
var value_x = Blockly.JavaScript.valueToCode(block, 'x', Blockly.JavaScript.ORDER_ATOMIC);
11-
var value_y = Blockly.JavaScript.valueToCode(block, 'y', Blockly.JavaScript.ORDER_ATOMIC);
12-
var value_z = Blockly.JavaScript.valueToCode(block, 'z', Blockly.JavaScript.ORDER_ATOMIC);
13-
var code = 'MCPI.setBlock('+value_x+','+value_y+','+value_z+',"'+dropdown_block+'");\n';
10+
var value_x = Blockly.JavaScript.valueToCode(block, 'x', Blockly.JavaScript.ORDER_ADDITION);
11+
var value_y = Blockly.JavaScript.valueToCode(block, 'y', Blockly.JavaScript.ORDER_ADDITION);
12+
var value_z = Blockly.JavaScript.valueToCode(block, 'z', Blockly.JavaScript.ORDER_ADDITION);
13+
var code = 'MCPI.setBlock('+value_x+'+MCPI.playerX,'+value_y+'+MCPI.playerY,'+value_z+'+MCPI.playerZ,"'+dropdown_block+'");\n';
1414
return code;
1515
};
1616

@@ -31,33 +31,38 @@ Blockly.JavaScript['minecraft_post_to_chat'] = function(block) {
3131
Blockly.JavaScript['minecraft_turtle_yaw'] = function(block) {
3232
Blockly.JavaScript.minecraft();
3333
var dropdown_direction = block.getFieldValue('DIRECTION');
34-
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_ATOMIC);
35-
var code = 'MCPI.turtleYaw(('+value_angle+')*'+dropdown_direction+');\n';
34+
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_MULTIPLICATION);
35+
var code = 'MCPI.turtleYaw('+value_angle+'*'+dropdown_direction+');\n';
3636
return code;
3737
};
3838

3939
Blockly.JavaScript['minecraft_turtle_pitch'] = function(block) {
4040
Blockly.JavaScript.minecraft();
4141
var dropdown_direction = block.getFieldValue('DIRECTION');
42-
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_ATOMIC);
43-
var code = 'MCPI.turtlePitch(('+value_angle+')*'+dropdown_direction+');\n';
42+
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_MULTIPLICATION);
43+
var code = 'MCPI.turtlePitch('+value_angle+'*'+dropdown_direction+');\n';
4444
return code;
4545
};
4646

4747
Blockly.JavaScript['minecraft_turtle_roll'] = function(block) {
4848
Blockly.JavaScript.minecraft();
4949
var dropdown_direction = block.getFieldValue('DIRECTION');
50-
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_ATOMIC);
51-
var code = 'MCPI.turtleRoll(('+value_angle+')*'+dropdown_direction+');\n';
50+
var value_angle = Blockly.JavaScript.valueToCode(block, 'ANGLE', Blockly.JavaScript.ORDER_MULTIPLICATION);
51+
var code = 'MCPI.turtleRoll('+value_angle+'*'+dropdown_direction+');\n';
5252
return code;
5353
};
5454

55-
Blockly.JavaScript['minecraft_turtle_set_pen'] = function(block) {
55+
Blockly.JavaScript['minecraft_turtle_pen_block'] = function(block) {
5656
Blockly.JavaScript.minecraft();
57-
var value_width = Blockly.JavaScript.valueToCode(block, 'WIDTH', Blockly.JavaScript.ORDER_ATOMIC);
5857
var dropdown_block = block.getFieldValue('BLOCK');
59-
var code = 'MCPI.turtleSetWidth('+value_width+');\n'+
60-
'MCPI.block = "'+dropdown_block+'";\n';
58+
var code = 'MCPI.block = "'+dropdown_block+'";\n';
59+
return code;
60+
};
61+
62+
Blockly.JavaScript['minecraft_turtle_pen_width'] = function(block) {
63+
Blockly.JavaScript.minecraft();
64+
var value_width = Blockly.JavaScript.valueToCode(block, 'WIDTH', Blockly.JavaScript.ORDER_ATOMIC);
65+
var code = 'MCPI.turtleSetWidth('+value_width+');\n';
6166
return code;
6267
};
6368

‎generators/python/minecraft.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,17 @@ Blockly.Python['minecraft_turtle_roll'] = function(block) {
6767
return code;
6868
};
6969

70-
Blockly.Python['minecraft_turtle_set_pen'] = function(block) {
70+
Blockly.Python['minecraft_turtle_pen_width'] = function(block) {
7171
Blockly.Python.minecraft();
7272
var value_width = Blockly.Python.valueToCode(block, 'WIDTH', Blockly.Python.ORDER_ATOMIC);
73+
var code = 'MCTURTLE.penwidth('+value_width+')\n';
74+
return code;
75+
};
76+
77+
Blockly.Python['minecraft_turtle_pen_block'] = function(block) {
78+
Blockly.Python.minecraft();
7379
var dropdown_block = block.getFieldValue('BLOCK');
74-
var code = 'MCTURTLE.penwidth('+value_width+')\n'+'MCTURTLE.setblock(Block('+dropdown_block+'))\n';
80+
var code = 'MCTURTLE.setblock(Block('+dropdown_block+'))\n';
7581
return code;
7682
};
7783

0 commit comments

Comments
 (0)