From 033b87deb57d74c56d4a5331ab72a14013297380 Mon Sep 17 00:00:00 2001 From: Hannes Greule Date: Fri, 5 Jun 2020 14:13:03 +0200 Subject: [PATCH] Resolve TODOs --- .../src/main/java/com/plotsquared/core/command/Setup.java | 1 - .../core/generator/IndependentPlotGenerator.java | 5 +++-- .../java/com/plotsquared/core/setup/CommonSetupSteps.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Core/src/main/java/com/plotsquared/core/command/Setup.java b/Core/src/main/java/com/plotsquared/core/command/Setup.java index 238f1bd5a..8f5f9574a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Setup.java +++ b/Core/src/main/java/com/plotsquared/core/command/Setup.java @@ -72,7 +72,6 @@ public class Setup extends SubCommand { SetupProcess process = player.getMeta("setup"); if (process == null) { if (args.length > 0) { - // TODO use old behaviour? MainUtil.sendMessage(player, Captions.SETUP_NOT_STARTED); return true; } diff --git a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java index b2e1278ab..324f6d8d4 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java +++ b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java @@ -30,6 +30,7 @@ import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotId; import com.plotsquared.core.plot.SetupObject; import com.plotsquared.core.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.setup.PlotAreaBuilder; import com.plotsquared.core.setup.SetupProcess; /** @@ -83,9 +84,9 @@ public abstract class IndependentPlotGenerator { * If any additional setup options need to be changed before world creation. * - e.g. If setup doesn't support some standard options * - * @param setupProcess the setup process to modify + * @param builder the area builder to modify */ - public void processSetup(SetupProcess setupProcess) { } + public void processAreaSetup(PlotAreaBuilder builder) { } /** * It is preferred for the PlotArea object to do most of the initialization necessary. diff --git a/Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java b/Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java index 39dc2dd1b..bd73bb74a 100644 --- a/Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java +++ b/Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java @@ -73,8 +73,8 @@ public enum CommonSetupSteps implements SetupStep { if (builder.settingsNodesWrapper() == null) { builder.plotManager(builder.generatorName()); builder.settingsNodesWrapper(CommonSetupSteps.wrap(builder.plotManager())); - // TODO reimplement SetupUtils.generators.get(object.plotManager).getPlotGenerator() - // .processSetup(process); + SetupUtils.generators.get(builder.plotManager()).getPlotGenerator() + .processAreaSetup(builder); } return builder.settingsNodesWrapper().getFirstStep(); } else { @@ -82,8 +82,8 @@ public enum CommonSetupSteps implements SetupStep { builder.plotManager(builder.generatorName()); builder.generatorName(null); builder.settingsNodesWrapper(CommonSetupSteps.wrap(builder.plotManager())); - // TODO reimplement SetupUtils.generators.get(object.plotManager).getPlotGenerator() - // .processSetup(process); + SetupUtils.generators.get(builder.plotManager()).getPlotGenerator() + .processAreaSetup(builder); } else { builder.plotManager(PlotSquared.imp().getPluginName()); MainUtil.sendMessage(plotPlayer, Captions.SETUP_WRONG_GENERATOR);