Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java

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

@@ -244,3 +244,23 @@ __on_player_disconnects(player, reason) ->
     print('__on_player_disconnects(player)');
     print('Player '+player+' disconnects because: '+reason)
 );
+
+__on_player_chooses_recipe(player, recipe, full_stack) ->
+(
+    print('');
+    print('__on_player_chooses_recipe(player, recipe, full_stack)');
+    print('player chooses recipe:');
+    print('  - player: '+player);
+    print('  - recipe: '+recipe);
+    print('  - full stack: '+ full_stack);
+);
+
+__on_player_switches_slot(player, from, to) ->
+(
+    print('');
+    print('__on_player_switches_slot(player, from, to)');
+    print('player switches inventory slot:');
+    print('  - player: '+player);
+    print('  - from: '+ from);
+    print('  - to: '+ to);
+);

src/main/resources/carpet.accesswidener

@@ -0,0 +1,2 @@
+accessWidener	v1  named
+Accessible class net/minecraft/recipe/Ingredient$Entry

src/main/resources/carpet.mixins.json

@@ -160,6 +160,9 @@
     "ServerWorld_scarpetEventMixin",
     "HungerManagerMixin_scarpetEventsMixin",
 
+    "RecipeManager_scarpetMixin",
+    "Ingredient_scarpetMixin",
+
     "PistonBlock_movableTEMixin",
     "PistonBlockEntity_movableTEMixin",
     "World_movableTEMixin",

src/main/resources/fabric.mod.json

@@ -24,6 +24,7 @@
   "mixins": [
     "carpet.mixins.json"
   ],
+  "accessWidener" : "carpet.accesswidener",
 
   "depends": {
     "minecraft": "1.16.x",