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/patches/EntityPlayerMPFake.java

@@ -19,6 +19,7 @@ import net.minecraft.world.dimension.DimensionType;
 import carpet.fakes.ServerPlayerEntityInterface;
 import carpet.utils.Messenger;
 
+@SuppressWarnings("EntityConstructor")
 public class EntityPlayerMPFake extends ServerPlayerEntity
 {
     public Runnable fixStartingPosition = () -> {};
@@ -93,6 +94,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
         super(server, worldIn, profile, interactionManagerIn);
     }
 
+
     @Override
     public void kill()
     {