From 80e3337033e5e59737a4f28bb9f41ca33441055a Mon Sep 17 00:00:00 2001 From: TylerS1066 Date: Sat, 7 Sep 2024 14:34:46 -0500 Subject: [PATCH 1/2] Try a lot --- .../structureboxes/StructureBoxes.java | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java b/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java index 08b0b46..f5fb1f2 100644 --- a/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java +++ b/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java @@ -91,19 +91,36 @@ public void onEnable() { Settings.FAWE = false; } - final Map data; + String schemDirName = null; try { - File weConfig = new File(getWorldEditPlugin().getDataFolder(), (Settings.FAWE ? "worldedit-" : "") + "config" + ".yml"); - Yaml yaml = new Yaml(); - data = yaml.load(new FileInputStream(weConfig)); - } catch (IOException e){ - getLogger().severe(I18nSupport.getInternationalisedString("Startup - Error reading WE config")); + // Try loading from config by file + File weConfig = new File(worldEditPlugin.getDataFolder(), (Settings.FAWE ? "worldedit-" : "") + "config" + ".yml"); + Map data = new Yaml().load(new FileInputStream(weConfig)); + data = (Map) data.get("saving"); + schemDirName = (String) data.get("dir"); + } catch (Exception e){ e.printStackTrace(); + try { + // Try loading from API + schemDirName = worldEditPlugin.getLocalConfiguration().saveDir; + } catch (Exception e2){ + e2.printStackTrace(); + try { + // Try loading from config by plugin + Map data = (Map) worldEditPlugin.getConfig().get("saving"); + schemDirName = (String) data.get("dir"); + } catch (Exception e3){ + e3.printStackTrace(); + } + } + } + + if (schemDirName == null) { + getLogger().severe(I18nSupport.getInternationalisedString("Startup - Error reading WE config")); getServer().getPluginManager().disablePlugin(this); return; } - - File schemDir = new File(worldEditPlugin.getDataFolder(), (String) ((Map) data.get("saving")).get("dir")); + File schemDir = new File(worldEditPlugin.getDataFolder(), schemDirName); worldEditHandler = new WorldEditHandler(schemDir, this); boolean foundRegionProvider = false; From 9fba45db73cd1f0196ceacb7b5ec9a70e54cefb7 Mon Sep 17 00:00:00 2001 From: TylerS1066 Date: Sat, 7 Sep 2024 14:43:53 -0500 Subject: [PATCH 2/2] Fix 1.20.6 loading --- .../structureboxes/StructureBoxes.java | 29 ++++--------------- .../commands/StructureBoxCommand.java | 4 +-- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java b/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java index f5fb1f2..6639ff4 100644 --- a/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java +++ b/src/main/java/io/github/eirikh1996/structureboxes/StructureBoxes.java @@ -91,31 +91,12 @@ public void onEnable() { Settings.FAWE = false; } - String schemDirName = null; + String schemDirName; try { - // Try loading from config by file - File weConfig = new File(worldEditPlugin.getDataFolder(), (Settings.FAWE ? "worldedit-" : "") + "config" + ".yml"); - Map data = new Yaml().load(new FileInputStream(weConfig)); - data = (Map) data.get("saving"); - schemDirName = (String) data.get("dir"); - } catch (Exception e){ + // Try loading from API + schemDirName = worldEditPlugin.getLocalConfiguration().saveDir; + } catch (Exception e) { e.printStackTrace(); - try { - // Try loading from API - schemDirName = worldEditPlugin.getLocalConfiguration().saveDir; - } catch (Exception e2){ - e2.printStackTrace(); - try { - // Try loading from config by plugin - Map data = (Map) worldEditPlugin.getConfig().get("saving"); - schemDirName = (String) data.get("dir"); - } catch (Exception e3){ - e3.printStackTrace(); - } - } - } - - if (schemDirName == null) { getLogger().severe(I18nSupport.getInternationalisedString("Startup - Error reading WE config")); getServer().getPluginManager().disablePlugin(this); return; @@ -152,7 +133,7 @@ public void onEnable() { getLogger().info(I18nSupport.getInternationalisedString("Startup - Restrict to regions set to false")); } - getCommand("structurebox").setExecutor(new StructureBoxCommand()); + getCommand("structurebox").setExecutor(new StructureBoxCommand(schemDirName)); getServer().getPluginManager().registerEvents(new BlockListener(), this); getServer().getPluginManager().registerEvents(new InventoryListener(), this); diff --git a/src/main/java/io/github/eirikh1996/structureboxes/commands/StructureBoxCommand.java b/src/main/java/io/github/eirikh1996/structureboxes/commands/StructureBoxCommand.java index 11ca731..56bf9d9 100644 --- a/src/main/java/io/github/eirikh1996/structureboxes/commands/StructureBoxCommand.java +++ b/src/main/java/io/github/eirikh1996/structureboxes/commands/StructureBoxCommand.java @@ -31,8 +31,8 @@ public class StructureBoxCommand implements TabExecutor { private final String schematicDir; - public StructureBoxCommand(){ - schematicDir = StructureBoxes.getInstance().getWorldEditPlugin().getConfig().getConfigurationSection("saving").getString("dir"); + public StructureBoxCommand(String schematicDirName) { + schematicDir = schematicDirName; } @Override public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {