Bump to RC02

Development

SECURITY.md

@@ -11,20 +11,23 @@ These versions are currently actively supported by our team, and you should expe
 
 | Version             | Supported          | Support End:                   |
 | ------------------- | ------------------ | ------------------------------ |
-| 2021.05             | :white_check_mark: | No Earlier than August 2021    |
+| 2021.09             | :white_check_mark: | No Earlier than December 2021    |
 
 ### Legacy Supported
 These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate. 
 
 | Version             | Supported          | Support End: |
 | ------------------- | ------------------ | ------------ |
-| 2021.04             | :white_check_mark: | July 2021    |
+| 2021.06             | :white_check_mark: | October 2021 |
+
 
 ### No Longer Supported
 These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions. 
 
 | Version             | Supported          | Support Ended:      |
 | ------------------- | ------------------ | ------------------- |
+| 2021.05             | :white_check_mark: | September 2021      |
+| 2021.04             | :white_check_mark: | July 2021           |
 | 2021.02             | :x:                | 6 June 2021         |
 | 2020.11             | :x:                | 3 May 2021          |
 | 6.0.x (Pre-Release) | :x:                | December 2020       |

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.06</version>
+    <version>2021.09-RC02</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/me/totalfreedom/totalfreedommod/command/Command_floatlands.java

@@ -1,19 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.NON_OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Go to the Floatlands (not to be confused with the Flatlands).", usage = "/<command>", aliases = "void")
-public class Command_floatlands extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        plugin.wm.floatlands.sendToWorld(playerSender);
-
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/world/CleanroomChunkGenerator.java

@@ -40,11 +40,6 @@ public class CleanroomChunkGenerator extends ChunkGenerator
     }
 
     public CleanroomChunkGenerator(String id)
-    {
-        this(id, true);
-    }
-
-    public CleanroomChunkGenerator(String id, boolean generateBedrock)
     {
         if (id != null)
         {
@@ -53,11 +48,7 @@ public class CleanroomChunkGenerator extends ChunkGenerator
                 int y = 0;
 
                 materials = new Material[128]; // Default to 128, will be resized later if required
-
-                if (generateBedrock)
-                {
-                    materials[y++] = Material.BEDROCK;
-                }
+                materials[y++] = Material.BEDROCK;
 
                 if (id.length() > 0)
                 {
@@ -124,24 +115,14 @@ public class CleanroomChunkGenerator extends ChunkGenerator
                 e.printStackTrace();
 
                 materials = new Material[65];
-
-                if (generateBedrock)
-                {
-                    materials[0] = Material.BEDROCK;
-                }
-
+                materials[0] = Material.BEDROCK;
                 Arrays.fill(materials, 1, 65, Material.STONE);
             }
         }
         else
         {
             materials = new Material[65];
-
-            if (generateBedrock)
-            {
-                materials[0] = Material.BEDROCK;
-            }
-
+            materials[0] = Material.BEDROCK;
             Arrays.fill(materials, 1, 65, Material.STONE);
         }
     }

src/main/java/me/totalfreedom/totalfreedommod/world/Floatlands.java

@@ -1,33 +0,0 @@
-package me.totalfreedom.totalfreedommod.world;
-
-import org.bukkit.*;
-
-public class Floatlands extends CustomWorld
-{
-
-    public Floatlands()
-    {
-        super("floatlands");
-    }
-
-    @Override
-    protected World generateWorld()
-    {
-        final WorldCreator worldCreator = new WorldCreator(getName());
-        worldCreator.generateStructures(false);
-        worldCreator.type(WorldType.NORMAL);
-        worldCreator.environment(World.Environment.NORMAL);
-        worldCreator.generator(new CleanroomChunkGenerator("", false));
-
-        final World world = Bukkit.getServer().createWorld(worldCreator);
-
-        assert world != null;
-        world.setSpawnFlags(false, false);
-        world.setSpawnLocation(0, 50, 0);
-
-        plugin.gr.commitGameRules();
-
-        return world;
-    }
-
-}

src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java

@@ -20,14 +20,12 @@ public class WorldManager extends FreedomService
     public Flatlands flatlands;
     public AdminWorld adminworld;
     public MasterBuilderWorld masterBuilderWorld;
-    public Floatlands floatlands;
 
     public WorldManager()
     {
         this.flatlands = new Flatlands();
         this.adminworld = new AdminWorld();
         this.masterBuilderWorld = new MasterBuilderWorld();
-        this.floatlands = new Floatlands();
     }
 
     @Override
@@ -36,7 +34,6 @@ public class WorldManager extends FreedomService
         flatlands.getWorld();
         adminworld.getWorld();
         masterBuilderWorld.getWorld();
-        floatlands.getWorld();
 
         // Disable weather
         if (ConfigEntry.DISABLE_WEATHER.getBoolean())