mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-08-24 23:05:36 +02:00
Compare commits
1 Commits
main
...
feat/v7/ge
Author | SHA1 | Date | |
---|---|---|---|
![]() |
91153e1b7b |
@@ -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/<world> etc."})
|
||||
public static boolean USE_SCHEMATICS_PATH_FOR_GEN_SCHEMATICS = false;
|
||||
|
||||
}
|
||||
|
||||
|
@@ -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()
|
||||
);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user