Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement multiple panels in single file (#1932) 

The existing template file reader could read a single configuration section from a file, and the section was required to start with the same name as the file.
This changes it and allows to read any configuration section from the panel.

This change is backward compatible and does not influence existing panels.
This commit is contained in:
BONNe 2022-01-29 04:42:23 +02:00 committed by GitHub
parent 3ecdda65b5
commit 52cc2a8593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java
View File

@ -42,6 +42,7 @@ public class TemplateReader
private static final String FORCE_SHOWN = "force-shown";
private static final String FALLBACK = "fallback";
/**
* Read template panel panel template record.
*
@ -50,6 +51,21 @@ public class TemplateReader
* @return the panel template record
*/
public static PanelTemplateRecord readTemplatePanel(@NonNull String panelName, @NonNull File panelLocation)
{
return readTemplatePanel(panelName, panelName, panelLocation);
}
/**
* Read template panel panel template record.
*
* @param panelName the panel name
* @param templateName the template file name
* @param panelLocation the panel location directory
* @return the panel template record
* @since 1.20.0
*/
public static PanelTemplateRecord readTemplatePanel(@NonNull String panelName, @NonNull String templateName, @NonNull File panelLocation)
{
if (!panelLocation.exists())
{
@ -57,7 +73,7 @@ public class TemplateReader
return null;
}
File file = new File(panelLocation, panelName.endsWith(".yml") ? panelName : panelName + ".yml");
File file = new File(panelLocation, templateName.endsWith(".yml") ? templateName : templateName + ".yml");
if (!file.exists())
{
@ -65,10 +81,12 @@ public class TemplateReader
return null;
}
final String panelKey = file.getAbsolutePath() + ":" + panelName;
// Check if panel is already crafted.
if (TemplateReader.loadedPanels.containsKey(file.getAbsolutePath()))
if (TemplateReader.loadedPanels.containsKey(panelKey))
{
return TemplateReader.loadedPanels.get(file.getAbsolutePath());
return TemplateReader.loadedPanels.get(panelKey);
}
PanelTemplateRecord record;
@ -81,7 +99,7 @@ public class TemplateReader
// Read panel
record = readPanelTemplate(config.getConfigurationSection(panelName));
// Put panel into memory
TemplateReader.loadedPanels.put(file.getAbsolutePath(), record);
TemplateReader.loadedPanels.put(panelKey, record);
}
catch (IOException | InvalidConfigurationException e)
{