Skip to content

Commit

Permalink
API名称统一
Browse files Browse the repository at this point in the history
  • Loading branch information
glorydark committed Feb 20, 2024
1 parent 1324c8d commit a29ebee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/main/java/glorydark/DLevelEventPlus/api/TemplateAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static void setTemplateSetting(String configName, String key, String subK
}
}

public static <T> T getTemplateSetting(String configName, String key, String subKey, T defaultValue) {
public static <T> T getTemplateObjectSetting(String configName, String key, String subKey, T defaultValue) {
if (templateCache.containsKey(configName)) {
Map<String, Object> templates = templateCache.get(configName);
if (templates != null && templates.containsKey(key)) {
Expand All @@ -41,17 +41,17 @@ public static <T> T getTemplateSetting(String configName, String key, String sub
}

@InternalUse(description = "to avoid some problems caused by forcibly conversion")
public static Object getTemplateSetting(String configName, String key, String subKey) {
return getTemplateSetting(configName, key, subKey, "");
public static Object getTemplateObjectSetting(String configName, String key, String subKey) {
return getTemplateObjectSetting(configName, key, subKey, "");
}

@InternalUse(description = "to avoid some problems caused by forcibly conversion")
public static Boolean getTemplateBooleanSetting(String configName, String key, String subKey) {
return getTemplateSetting(configName, key, subKey, false);
return getTemplateObjectSetting(configName, key, subKey, false);
}

@InternalUse(description = "to avoid some problems caused by forcibly conversion")
public static List<String> getTemplateListSetting(String configName, String key, String subKey) {
return getTemplateSetting(configName, key, subKey, new ArrayList<>());
return getTemplateObjectSetting(configName, key, subKey, new ArrayList<>());
}
}
4 changes: 2 additions & 2 deletions src/main/java/glorydark/DLevelEventPlus/gui/FormMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ public static void showTemplateSettingMenuV2(Player player, String templateName,
if (entry instanceof BooleanProtectionRuleEntry) {
formWindowCustom.addElement(new ElementToggle(entry.getTranslation(), TemplateAPI.getTemplateBooleanSetting(templateName, entry.getCategory(), entry.getEntryName())));
} else if (entry instanceof DropdownProtectionRuleEntry) {
Object object = TemplateAPI.getTemplateSetting(templateName, entry.getCategory(), entry.getEntryName());
Object object = TemplateAPI.getTemplateObjectSetting(templateName, entry.getCategory(), entry.getEntryName());
formWindowCustom.addElement(new ElementDropdown(entry.getTranslation(), ((DropdownProtectionRuleEntry) entry).getOptions(), object == null ? 0 : Math.max(((DropdownProtectionRuleEntry) entry).getOptions().indexOf(object.toString()), 0)));
} else if (entry instanceof InputProtectionRuleEntry) {
Object object = TemplateAPI.getTemplateSetting(templateName, entry.getCategory(), entry.getEntryName());
Object object = TemplateAPI.getTemplateObjectSetting(templateName, entry.getCategory(), entry.getEntryName());
formWindowCustom.addElement(new ElementInput(entry.getTranslation(), object == null? "" : object.toString()));
}
}
Expand Down

0 comments on commit a29ebee

Please sign in to comment.