Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/resources/carpet.mixins.json

src/main/resources/assets/carpet/scripts/event_test.sc

@@ -160,7 +160,28 @@ __on_player_drops_stack(player) -> (
     print('Player '+player+' drops current stack.')
 );
 
-__on_statistic(player, category, event, value) ->
+__on_player_interacts_with_block(player, hand, block, face, hitvec) ->
 (
-    print('__on_statistic(player, category, event, value) -> ['+join(', ',l(player, category, event, value))+']');
-);
+	print('');
+	print('__on_player_interacts_with_block(player, hand, block, face, hitvec) ');
+	print('block right clicked by player:');
+	print('  - player: '+player);
+	print('  - hand: '+hand);
+	print('  - block: '+block+' at '+map(pos(block), str('%.2f',_)));
+	print('  - face: '+face);
+	print('  - hitvec: '+map(hitvec, str('%.2f',_)))
+);
+__on_player_places_block(player, item_tuple, hand, block) ->
+(
+    l(item, count, nbt) = item_tuple || l('None', 0, null);
+	print('');
+	print('__on_player_places_block(player, item_tuple, hand, block)');
+	print('player places a block:');
+	print('  - player: '+player);
+	print('  - block: '+block+' at '+map(pos(block), str('%.2f',_)));
+	print('  - hand: '+hand);
+	print('  - item:');
+    print('    > name: '+item);
+    print('    > count: '+count);
+    print('    > nbt: '+nbt);
+);

src/main/resources/assets/carpet/scripts/stats_test.sc

@@ -0,0 +1,5 @@
+__on_statistic(player, category, event, value) ->
+(
+    print('__on_statistic(player, category, event, value) -> ');
+    print('   ['+join(', ',l(player, category, event, value))+']');
+);

src/main/resources/carpet.mixins.json

@@ -132,9 +132,13 @@
     "DamageTracker_scarpetEventMixin",
     "ServerPlayerEntity_scarpetEventMixin",
     "FallingBlockEntity_scarpetEventsMixin",
+    "BlockItem_scarpetEventMixin",
 
     "ChunkTicketManager_scarpetMixin",
     "ServerChunkManager_scarpetMixin",
+    "StatType_scarpetMixin",
+
+
     "PistonBlock_movableTEMixin",
     "PistonBlockEntity_movableTEMixin",
     "World_movableTEMixin",