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;

src/main/java/carpet/helpers/FeatureGenerator.java

@@ -123,7 +123,7 @@ public class FeatureGenerator
     }
     public static void noop() {System.out.println("boo");}
 
-    private static Map<String, Thing> featureMap = new HashMap<String, Thing>() {{
+    private static final Map<String, Thing> featureMap = new HashMap<String, Thing>() {{
 
 
         put("oak", simpleTree(DefaultBiomeFeatures.OAK_TREE_CONFIG));

src/main/java/carpet/helpers/OptimizedExplosion.java

@@ -365,7 +365,7 @@ public class OptimizedExplosion
 
     private static void getAffectedPositionsOnPlaneX(Explosion e, int x, int yStart, int yEnd, int zStart, int zEnd)
     {
-        if (rayCalcDone == false)
+        if (!rayCalcDone)
         {
             final double xRel = (double) x / 15.0D * 2.0D - 1.0D;
 
@@ -388,7 +388,7 @@ public class OptimizedExplosion
 
     private static void getAffectedPositionsOnPlaneY(Explosion e, int y, int xStart, int xEnd, int zStart, int zEnd)
     {
-        if (rayCalcDone == false)
+        if (!rayCalcDone)
         {
             final double yRel = (double) y / 15.0D * 2.0D - 1.0D;
 
@@ -411,7 +411,7 @@ public class OptimizedExplosion
 
     private static void getAffectedPositionsOnPlaneZ(Explosion e, int z, int xStart, int xEnd, int yStart, int yEnd)
     {
-        if (rayCalcDone == false)
+        if (!rayCalcDone)
         {
             final double zRel = (double) z / 15.0D * 2.0D - 1.0D;
 

src/main/java/carpet/helpers/PortalHelper.java

@@ -8,12 +8,8 @@ public class PortalHelper
 {
     public static boolean player_holds_obsidian(PlayerEntity playerIn)
     {
-        if ( (!playerIn.getMainHandStack().isEmpty()
-            && playerIn.getMainHandStack().getItem() instanceof BlockItem &&
-            ((BlockItem)(playerIn.getMainHandStack().getItem())).getBlock() == Blocks.OBSIDIAN   ))
-        {
-            return true;
-        }
-        return false;
+        return (!playerIn.getMainHandStack().isEmpty()
+                && playerIn.getMainHandStack().getItem() instanceof BlockItem &&
+                ((BlockItem) (playerIn.getMainHandStack().getItem())).getBlock() == Blocks.OBSIDIAN);
     }
 }

src/main/java/carpet/helpers/RedstoneWireTurbo.java

@@ -193,7 +193,7 @@ public class RedstoneWireTurbo
     private static final int West = 3;
  
     // Names for debug print statements
-    private static final char dirname[] = {'N', 'E', 'S', 'W'};
+    private static final char[] dirname = {'N', 'E', 'S', 'W'};
  
     /* 
      * These lookup tables completely remap neighbor positions into a left-to-right
@@ -269,7 +269,7 @@ public class RedstoneWireTurbo
      * neighbors that will receive updates.
      */
     private static class UpdateNode {
-        public static enum Type {
+        public enum Type {
             UNKNOWN, REDSTONE, OTHER
         }