diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java index 04e88a40c..39718a0cf 100644 --- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java @@ -435,6 +435,11 @@ public class Settings extends Config { public static String SCHEMATICS = "schematics"; public static String TEMPLATES = "templates"; + @Comment({"If schematics used for generation should be searched for in the path.schematics location", + " - This settings exists and is `false` by default for backwards compatibility.", + " - If false then generation schematics must be located in `schematics`", + " - Schematics must still always be under GEN_ROAD_SCHEMATIC/ etc."}) + public static boolean USE_SCHEMATICS_PATH_FOR_GEN_SCHEMATICS = false; } diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java index d0ebd643b..326bf7284 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java @@ -140,7 +140,8 @@ public class HybridPlotWorld extends ClassicPlotWorld { @NonNull @Override protected PlotManager createManager() { - return new HybridPlotManager(this, PlotSquared.platform().regionManager(), + return new HybridPlotManager( + this, PlotSquared.platform().regionManager(), PlotSquared.platform().injector().getInstance(ProgressSubscriberFactory.class) ); } @@ -215,15 +216,16 @@ public class HybridPlotWorld extends ClassicPlotWorld { // Try to determine root. This means that plot areas can have separate schematic // directories + String schematicFolder = Settings.Paths.USE_SCHEMATICS_PATH_FOR_GEN_SCHEMATICS ? Settings.Paths.SCHEMATICS : "schematics"; if (!(root = FileUtils.getFile( PlotSquared.platform().getDirectory(), - "schematics/GEN_ROAD_SCHEMATIC/" + this.getWorldName() + "/" + this.getId() + schematicFolder + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + this.getWorldName() + File.separator + this.getId() )) .exists()) { root = FileUtils.getFile( PlotSquared.platform().getDirectory(), - "schematics/GEN_ROAD_SCHEMATIC/" + this.getWorldName() + schematicFolder + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + this.getWorldName() ); }