Skip to content

Commit e16da67

Browse files
authored
1.20.6 (#6)
* Try a lot * Fix 1.20.6 loading
1 parent 837df0e commit e16da67

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,17 @@ public void onEnable() {
9191
Settings.FAWE = false;
9292
}
9393

94-
final Map data;
94+
String schemDirName;
9595
try {
96-
File weConfig = new File(getWorldEditPlugin().getDataFolder(), (Settings.FAWE ? "worldedit-" : "") + "config" + ".yml");
97-
Yaml yaml = new Yaml();
98-
data = yaml.load(new FileInputStream(weConfig));
99-
} catch (IOException e){
100-
getLogger().severe(I18nSupport.getInternationalisedString("Startup - Error reading WE config"));
96+
// Try loading from API
97+
schemDirName = worldEditPlugin.getLocalConfiguration().saveDir;
98+
} catch (Exception e) {
10199
e.printStackTrace();
100+
getLogger().severe(I18nSupport.getInternationalisedString("Startup - Error reading WE config"));
102101
getServer().getPluginManager().disablePlugin(this);
103102
return;
104103
}
105-
106-
File schemDir = new File(worldEditPlugin.getDataFolder(), (String) ((Map) data.get("saving")).get("dir"));
104+
File schemDir = new File(worldEditPlugin.getDataFolder(), schemDirName);
107105
worldEditHandler = new WorldEditHandler(schemDir, this);
108106

109107
boolean foundRegionProvider = false;
@@ -135,7 +133,7 @@ public void onEnable() {
135133
getLogger().info(I18nSupport.getInternationalisedString("Startup - Restrict to regions set to false"));
136134
}
137135

138-
getCommand("structurebox").setExecutor(new StructureBoxCommand());
136+
getCommand("structurebox").setExecutor(new StructureBoxCommand(schemDirName));
139137

140138
getServer().getPluginManager().registerEvents(new BlockListener(), this);
141139
getServer().getPluginManager().registerEvents(new InventoryListener(), this);

src/main/java/io/github/eirikh1996/structureboxes/commands/StructureBoxCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
public class StructureBoxCommand implements TabExecutor {
3333
private final String schematicDir;
34-
public StructureBoxCommand(){
35-
schematicDir = StructureBoxes.getInstance().getWorldEditPlugin().getConfig().getConfigurationSection("saving").getString("dir");
34+
public StructureBoxCommand(String schematicDirName) {
35+
schematicDir = schematicDirName;
3636
}
3737
@Override
3838
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {

0 commit comments

Comments
 (0)