Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java

src/main/java/carpet/helpers/EntityPlayerActionPack.java

@@ -24,9 +24,9 @@ import java.util.TreeMap;
 
 public class EntityPlayerActionPack
 {
-    private ServerPlayerEntity player;
+    private final ServerPlayerEntity player;
 
-    private Map<ActionType, Action> actions = new TreeMap<>();
+    private final Map<ActionType, Action> actions = new TreeMap<>();
 
     private BlockPos currentBlock;
     private int blockHitDelay;