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/utils/BlockInfo.java

@@ -22,7 +22,7 @@ import java.util.Map;
 
 public class BlockInfo
 {
-    public static Map<BlockSoundGroup, String> soundName = new HashMap<BlockSoundGroup, String>() {{
+    public static final Map<BlockSoundGroup, String> soundName = new HashMap<BlockSoundGroup, String>() {{
         put(BlockSoundGroup.WOOD,   "wood"  );
         put(BlockSoundGroup.GRAVEL, "gravel");
         put(BlockSoundGroup.GRASS,  "grass" );
@@ -47,7 +47,7 @@ public class BlockInfo
         put(BlockSoundGroup.LANTERN , "lantern" );
     }};
 
-    public static Map<MaterialColor, String> mapColourName = new HashMap<MaterialColor, String>() {{
+    public static final Map<MaterialColor, String> mapColourName = new HashMap<MaterialColor, String>() {{
         put(MaterialColor.AIR       , "air"       );
         put(MaterialColor.GRASS     , "grass"     );
         put(MaterialColor.SAND      , "sand"      );
@@ -102,7 +102,7 @@ public class BlockInfo
         put(MaterialColor.BLACK_TERRACOTTA     , "black_terracotta"      );
     }};
 
-    public static Map<Material, String> materialName = new HashMap<Material, String>() {{
+    public static final Map<Material, String> materialName = new HashMap<Material, String>() {{
         put(Material.AIR            , "air"          );
         put(Material.STRUCTURE_VOID , "void"         );
         put(Material.PORTAL         , "portal"       );
@@ -232,7 +232,7 @@ public class BlockInfo
         long total_time = (total_ticks)/1000/20;
         return Messenger.s(String.format(" - Wander chance above: %.1f%%\n - Average standby above: %s",
                 (100.0F*success)/1000,
-                ((total_time>5000)?"INFINITY":(Long.toString(total_time)+" s"))
+                ((total_time>5000)?"INFINITY":(total_time +" s"))
         ));
     }
 }

src/main/java/carpet/utils/CarpetProfiler.java

@@ -21,9 +21,9 @@ public class CarpetProfiler
     private static int tick_health_elapsed = 0;
     private static TYPE test_type = TYPE.NONE; //1 for ticks, 2 for entities;
     private static long current_tick_start = 0;
-    private static String[] GENERAL_SECTIONS = {"Network", "Autosave", "Async Tasks"};
-    private static String[] DIMENSIONS = {"overworld", "the_end", "the_nether"};
-    private static String[] SECTIONS = {
+    private static final String[] GENERAL_SECTIONS = {"Network", "Autosave", "Async Tasks"};
+    private static final String[] DIMENSIONS = {"overworld", "the_end", "the_nether"};
+    private static final String[] SECTIONS = {
             "Spawning and Random Ticks", "Ticket Manager","Unloading",
             "Blocks", "Entities", "Block Entities",
             "Entities (Client)", "Block Entities (Client)",
@@ -39,10 +39,10 @@ public class CarpetProfiler
 
     public static class ProfilerToken
     {
-        public TYPE type;
-        public Object section;
-        public long start;
-        public World world;
+        public final TYPE type;
+        public final Object section;
+        public final long start;
+        public final World world;
 
         public ProfilerToken(TYPE type, Object section, World world, long start)
         {

src/main/java/carpet/utils/Messenger.java

@@ -114,7 +114,7 @@ public class Messenger
         {
             message = "w"+message;
         }
-        String parts[] = message.split("\\s", 2);
+        String[] parts = message.split("\\s", 2);
         String desc = parts[0];
         String str = "";
         if (parts.length > 1) str = parts[1];

src/main/java/carpet/utils/SpawnReporter.java

@@ -323,7 +323,7 @@ public class SpawnReporter
                     "w ' to enable"));
             return report;
         }
-        Long duration = (long) worldIn.getServer().getTicks() - track_spawns;
+        long duration = (long) worldIn.getServer().getTicks() - track_spawns;
         report.add(Messenger.c("bw --------------------"));
         String simulated = mock_spawns?"[SIMULATED] ":"";
         String location = (lower_spawning_limit != null)?String.format("[in (%d, %d, %d)x(%d, %d, %d)]",
@@ -410,8 +410,8 @@ public class SpawnReporter
                         continue; // vanilla bug
                     boolean canspawn = SpawnHelper.canSpawn(SpawnRestriction.getLocation(spawnEntry.type), worldIn, pos, spawnEntry.type);
                     int will_spawn = -1;
-                    boolean fits = false;
-                    boolean fits1 = false;
+                    boolean fits;
+                    boolean fits1;
                     
                     MobEntity mob;
                     try