Update DiscordToMinecraftListener.java

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/discord/DiscordToMinecraftListener.java

@@ -34,7 +34,19 @@ public class DiscordToMinecraftListener extends ListenerAdapter
                 {
                     message.append(" ").append(tag);
                 }
-                message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName())).append(ChatColor.DARK_GRAY).append(":").append(ChatColor.RESET);
+                
+                message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName())).append(ChatColor.DARK_GRAY).append(":");
+                
+                Message repliedTo = msg.getReferencedMessage();
+                
+                if (repliedTo != null)
+                {
+                    message.append(ChatColor.DARK_GRAY + ChatColor.ITALIC +"[" + ChatColor.GRAY + "Replying to " + ChatColor.BOLD + repliedTo.getAuthor().getName() + ChatColor.RESET + ChatColor.DARK_GRAY+  "]" + ChatColor.RESET);
+                } else
+                {
+                    message.append(ChatColor.RESET + " ");
+                }
+                
                 ComponentBuilder builder = new ComponentBuilder(message.toString());
                 if (!msg.getContentDisplay().isEmpty())
                 {

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;
-                }
 
                 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;
-                }
-
                 Arrays.fill(materials, 1, 65, Material.STONE);
             }
         }
         else
         {
             materials = new Material[65];
-
-            if (generateBedrock)
-            {
             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())