2.7.0 Snapshot 1
In this update some functions were rewritten, changed and added. Also some minor bugs have been fixed. The GUIs files have been split into GUI files and function files, this provides more clarity in the complete plugin structure and offers the possibility to access a function from multiple GUIs. Thus, for example, you can create a back button as a function and open it from 3 GUIs, the item, the function can also be in different places, because the slot is set in the GUI file. In the GUI files is thus specified on which slot which function should be located. In addition, the permission for See and for Use of the functions can now be set individually in the GUI Config. In the functions also 2 new functions were added, with which players can switch permissions on and off and an option to switch the UseItem on and off. Placeholders have been added. This update includes a converter that builds the new structure from the old config structure. Your options should be taken over. For security reasons your old GUI files are saved under the path 'plugins/CommandGUI/OldConfig/GUIs/Version4'. Bug fixes: - Fixed a bug that prevented GUIs from opening. - The OpenGUI option, the command '/cgui <guiname>' did not work. The GUI that was set as default GUI in UseItem was always opened. This was fixed New features: - Placeholders - %commandgui_useitem% - Shows if you have activated or deactivated the UseItem (in color, customizable in config.yml) - %commandgui_useitem_boolean% - Shows if you have enabled or disabled the UseItem - %commandgui_useitem_slot% - shows on which slot you have set the UseItem - ToggleUseItem as new option for slots - TogglePermission as new option for slots Changes: - The config structure has been revised.
This commit is contained in:
@@ -0,0 +1,162 @@
|
||||
package de.jatitv.commandguiv2.Spigot.objects;
|
||||
|
||||
import de.jatitv.commandguiv2.Spigot.Main;
|
||||
import de.jatitv.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUITab;
|
||||
import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
|
||||
import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
|
||||
import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
|
||||
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
public class Obj_Select {
|
||||
public static void onSelect() {
|
||||
onSelectGui();
|
||||
onSelectFunction();
|
||||
}
|
||||
|
||||
public static void onSelectGui() {
|
||||
Main.guiHashMap.clear();
|
||||
Main.allAliases.clear();
|
||||
File f = new File(Main.getPath() + "/GUIs/");
|
||||
File[] fileArray = f.listFiles();
|
||||
|
||||
for (File config_gui : fileArray) {
|
||||
String sub = config_gui.getName().substring(config_gui.getName().length() - 4);
|
||||
if (sub.equals(".yml")) {
|
||||
Main.allAliases.add(config_gui.getName().replace(".yml", ""));
|
||||
YamlConfiguration yamlConfiguration_gui = YamlConfiguration.loadConfiguration(config_gui);
|
||||
String guiFileName = config_gui.getName().replace(".yml", "");
|
||||
|
||||
Boolean guiEnable = yamlConfiguration_gui.getBoolean("GUI.Enable");
|
||||
Integer guiLines = yamlConfiguration_gui.getInt("GUI.Lines");
|
||||
if (yamlConfiguration_gui.getInt("GUI.Lines") > 6) {
|
||||
yamlConfiguration_gui.set("GUI.Lines", 6);
|
||||
}
|
||||
if (yamlConfiguration_gui.getInt("GUI.Lines") < 1) {
|
||||
yamlConfiguration_gui.set("GUI.Lines", 1);
|
||||
}
|
||||
|
||||
String guiName = yamlConfiguration_gui.getString("GUI.Name");
|
||||
Boolean guiFillItemEnable = yamlConfiguration_gui.getBoolean("GUI.FillItem.Enable");
|
||||
String guiFillItemItem;
|
||||
if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
|
||||
guiFillItemItem = yamlConfiguration_gui.getString("GUI.FillItem.GlassPaneColor");
|
||||
} else guiFillItemItem = yamlConfiguration_gui.getString("GUI.FillItem.Item");
|
||||
|
||||
Boolean commandAliasEnable = yamlConfiguration_gui.getBoolean("Command.Alias");
|
||||
Boolean commandPermission = yamlConfiguration_gui.getBoolean("Command.Permission.Required");
|
||||
|
||||
ArrayList<Slot> slots = new ArrayList<>();
|
||||
for (String key : yamlConfiguration_gui.getConfigurationSection("Slots").getKeys(false)) {
|
||||
Integer slotNumber = yamlConfiguration_gui.getInt("Slots." + key + ".Slot") - 1;
|
||||
Boolean enable = yamlConfiguration_gui.getBoolean("Slots." + key + ".Enable");
|
||||
String function = yamlConfiguration_gui.getString("Slots." + key + ".Function");
|
||||
Boolean permRequired = yamlConfiguration_gui.getBoolean("Slots." + key + ".Permission.Required");
|
||||
String permSee = yamlConfiguration_gui.getString("Slots." + key + ".Permission.See");
|
||||
String permUse = yamlConfiguration_gui.getString("Slots." + key + ".Permission.Use");
|
||||
|
||||
Slot slot = new Slot(slotNumber, enable, function, permRequired,
|
||||
Objects.requireNonNull(permSee).replace("[guiname]", guiFileName).replace("[slot]", String.valueOf(slotNumber))
|
||||
.replace("[slotname]", key), permUse);
|
||||
slots.add(slot);
|
||||
}
|
||||
Gui gui = new Gui(guiEnable, guiLines, guiName, guiFillItemEnable, guiFillItemItem,
|
||||
config_gui.getName().replace(".yml", ""), commandAliasEnable, commandPermission, slots);
|
||||
|
||||
Main.guiHashMap.put(guiFileName, gui);
|
||||
CmdExecuter_GUITab.arg1.put(config_gui.getName()
|
||||
.replace(".yml", ""), "commandgui.gui." + config_gui.getName().replace(".yml", ""));
|
||||
|
||||
try {
|
||||
yamlConfiguration_gui.save(config_gui);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void onSelectFunction() {
|
||||
Main.functionHashMap.clear();
|
||||
File f = new File(Main.getPath() + "/Functions/");
|
||||
File[] fileArray = f.listFiles();
|
||||
|
||||
for (File config : fileArray) {
|
||||
String sub = config.getName().substring(config.getName().length() - 4);
|
||||
if (sub.equals(".yml")) {
|
||||
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
|
||||
|
||||
Boolean empty = yamlConfiguration.getBoolean("Slots.Function.Item.Empty");
|
||||
Integer itemAmount = yamlConfiguration.getInt("Slots.Function.Item.Amount");
|
||||
Boolean playerHead_Enable = yamlConfiguration.getBoolean("Slots.Function.Item.PlayerHead.Enable");
|
||||
Boolean base64_Enable = yamlConfiguration.getBoolean("Slots.Function.Item.PlayerHead.Base64.Enable");
|
||||
String base64Value = yamlConfiguration.getString("Slots.Function.Item.PlayerHead.Base64.Base64Value");
|
||||
Boolean playerWhoHasOpenedTheGUI = yamlConfiguration.getBoolean("Slots.Function.Item.PlayerHead.PlayerWhoHasOpenedTheGUI");
|
||||
String playerName = yamlConfiguration.getString("Slots.Function.Item.PlayerHead.PlayerName");
|
||||
String item = yamlConfiguration.getString("Slots.Function.Item.Material");
|
||||
String name = yamlConfiguration.getString("Slots.Function.Item.Name");
|
||||
List<String> lore = yamlConfiguration.getStringList("Slots.Function.Item.Lore");
|
||||
Boolean customSound_Enable = yamlConfiguration.getBoolean("Slots.Function.CustomSound.Enable");
|
||||
Boolean customSound_NoSound = yamlConfiguration.getBoolean("Slots.Function.CustomSound.NoSound");
|
||||
String customSound_Sound = yamlConfiguration.getString("Slots.Function.CustomSound.Sound");
|
||||
Boolean cost_Enable = yamlConfiguration.getBoolean("Slots.Function.Cost.Enable");
|
||||
Double price = yamlConfiguration.getDouble("Slots.Function.Cost.Price");
|
||||
Boolean command_Enable = yamlConfiguration.getBoolean("Slots.Function.Command.Enable");
|
||||
Boolean command_BungeeCommand = yamlConfiguration.getBoolean("Slots.Function.Command.BungeeCommand");
|
||||
Boolean commandAsConsole = yamlConfiguration.getBoolean("Slots.Function.Command.CommandAsConsole");
|
||||
List<String> command = yamlConfiguration.getStringList("Slots.Function.Command.Command");
|
||||
Boolean serverChange = yamlConfiguration.getBoolean("Slots.Function.ServerChange.Enable");
|
||||
String serverChangeServer = yamlConfiguration.getString("Slots.Function.ServerChange.Server");
|
||||
Boolean openGUI_Enable = yamlConfiguration.getBoolean("Slots.Function.OpenGUI.Enable");
|
||||
String openGUI = yamlConfiguration.getString("Slots.Function.OpenGUI.GUI");
|
||||
Boolean togglePermission = yamlConfiguration.getBoolean("Slots.Function.Toggle.Permission.Enable");
|
||||
String togglePermissionPerm = yamlConfiguration.getString("Slots.Function.Toggle.Permission.Permission");
|
||||
Boolean toggleUseItem = yamlConfiguration.getBoolean("Slots.Function.Toggle.UseItem.Enable");
|
||||
Boolean message_Enable = yamlConfiguration.getBoolean("Slots.Function.Message.Enable");
|
||||
List<String> message = yamlConfiguration.getStringList("Slots.Function.Message.Message");
|
||||
Boolean setConfigEnable = yamlConfiguration.getBoolean("Slots.Function.SetConfig.Enable");
|
||||
String configFilePath = yamlConfiguration.getString("Slots.Function.SetConfig.File.Path");
|
||||
String configOptionPath = yamlConfiguration.getString("Slots.Function.SetConfig.Option.Path");
|
||||
String configOptionPremat = yamlConfiguration.getString("Slots.Function.SetConfig.Option.Premat");
|
||||
// Boolean ConfigChatInput = ;
|
||||
|
||||
String configStringValueLeft = yamlConfiguration.getString("Slots.Function.SetConfig.Value.LeftClick.String");
|
||||
Boolean configBooleanValueLeft = yamlConfiguration.getBoolean("Slots.Function.SetConfig.Value.LeftClick.Boolean");
|
||||
Integer configIntegerValueLeft = yamlConfiguration.getInt("Slots.Function.SetConfig.Value.LeftClick.Integer");
|
||||
Double configDoubleValueLeft = yamlConfiguration.getDouble("Slots.Function.SetConfig.Value.LeftClick.Double");
|
||||
List<String> configListValueLeft = yamlConfiguration.getStringList("Slots.Function.SetConfig.Value.LeftClick.List");
|
||||
|
||||
String configStringValueRight = yamlConfiguration.getString("Slots.Function.SetConfig.Value.RightClick.String");
|
||||
Boolean configBooleanValueRight = yamlConfiguration.getBoolean("Slots.Function.SetConfig.Value.RightClick.Boolean");
|
||||
Integer configIntegerValueRight = yamlConfiguration.getInt("Slots.Function.SetConfig.Value.RightClick.Integer");
|
||||
Double configDoubleValueRight = yamlConfiguration.getDouble("Slots.Function.SetConfig.Value.RightClick.Double");
|
||||
List<String> configListValueRight = yamlConfiguration.getStringList("Slots.Function.SetConfig.RightClick.Value.List");
|
||||
|
||||
|
||||
Boolean pluginReloadEnable = yamlConfiguration.getBoolean("Slots.Function.SetConfig.PluginReload.Enable");
|
||||
String pluginReloadCommand = yamlConfiguration.getString("Slots.Function.SetConfig.PluginReload.Command");
|
||||
|
||||
|
||||
Function function = new Function(empty, itemAmount, playerHead_Enable, base64_Enable, base64Value, playerWhoHasOpenedTheGUI, playerName, item, name, lore,
|
||||
customSound_Enable, customSound_NoSound, customSound_Sound, cost_Enable, price, command_Enable, command_BungeeCommand, commandAsConsole, command,
|
||||
serverChange, serverChangeServer, openGUI_Enable, openGUI, togglePermission, togglePermissionPerm, toggleUseItem, message_Enable, message,
|
||||
setConfigEnable, configFilePath, configOptionPath, configOptionPremat, configStringValueLeft, configBooleanValueLeft, configIntegerValueLeft,
|
||||
configDoubleValueLeft, configListValueLeft, configStringValueRight, configBooleanValueRight, configIntegerValueRight, configDoubleValueRight,
|
||||
configListValueRight, pluginReloadEnable, pluginReloadCommand);
|
||||
Main.functionHashMap.put(config.getName().replace(".yml", ""), function);
|
||||
|
||||
try {
|
||||
yamlConfiguration.save(config);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,157 @@
|
||||
package de.jatitv.commandguiv2.Spigot.objects.functions;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Function {
|
||||
|
||||
public Boolean empty;
|
||||
public Integer itemAmount;
|
||||
public Boolean playerHead_Enable;
|
||||
public Boolean base64_Enable;
|
||||
public String base64Value;
|
||||
public Boolean playerWhoHasOpenedTheGUI;
|
||||
public String playerName;
|
||||
public String item;
|
||||
public String name;
|
||||
public List lore;
|
||||
public Boolean customSound_Enable;
|
||||
public Boolean customSound_NoSound;
|
||||
public String customSound_Sound;
|
||||
public Boolean cost_Enable;
|
||||
public Double price;
|
||||
public Boolean command_Enable;
|
||||
public Boolean command_BungeeCommand;
|
||||
public Boolean commandAsConsole;
|
||||
public Boolean serverChange;
|
||||
public String serverChangeServer;
|
||||
public List<String> command;
|
||||
public Boolean openGUI_Enable;
|
||||
public String openGUI;
|
||||
public Boolean togglePermission;
|
||||
public String togglePermissionPerm;
|
||||
public Boolean toggleUseItem;
|
||||
public Boolean message_Enable;
|
||||
public List<String> message;
|
||||
public Boolean setConfigEnable;
|
||||
public String configFilePath;
|
||||
public String configOptionPath;
|
||||
public String configOptionPremat;
|
||||
// public Boolean ConfigChatInput;
|
||||
|
||||
public String configStringValueLeft;
|
||||
public Boolean configBooleanValueLeft;
|
||||
public Integer configIntegerValueLeft;
|
||||
public Double configDoubleValueLeft;
|
||||
public List<String> configListValueLeft;
|
||||
|
||||
public String configStringValueRight;
|
||||
public Boolean configBooleanValueRight;
|
||||
public Integer configIntegerValueRight;
|
||||
public Double configDoubleValueRight;
|
||||
public List<String> configListValueRight;
|
||||
|
||||
|
||||
public Boolean pluginReloadEnable;
|
||||
public String pluginReloadCommand;
|
||||
|
||||
public Function(Boolean empty,
|
||||
Integer itemAmount,
|
||||
Boolean playerHead_Enable,
|
||||
Boolean base64Value_Enable,
|
||||
String base64Value,
|
||||
Boolean playerWhoHasOpenedTheGUI,
|
||||
String playerName,
|
||||
String item,
|
||||
String name,
|
||||
List<String> lore,
|
||||
Boolean customSound_Enable,
|
||||
Boolean customSound_NoSound,
|
||||
String customSound_Sound,
|
||||
Boolean cost_Enable,
|
||||
Double price,
|
||||
Boolean command_Enable,
|
||||
Boolean command_BungeeCommand,
|
||||
Boolean commandAsConsole,
|
||||
List<String> command,
|
||||
Boolean serverChange,
|
||||
String serverChangeServer,
|
||||
Boolean openGUI_Enable,
|
||||
String openGUI,
|
||||
Boolean togglePermission,
|
||||
String togglePermissionPerm,
|
||||
Boolean toggleUseItem,
|
||||
Boolean message_Enable,
|
||||
List<String> message,
|
||||
Boolean setConfigEnable,
|
||||
String configFilePath,
|
||||
String configOptionPath,
|
||||
String configOptionPremat,
|
||||
|
||||
String configStringValueLeft,
|
||||
Boolean configBooleanValueLeft,
|
||||
Integer configIntegerValueLeft,
|
||||
Double configDoubleValueLeft,
|
||||
List<String> configListValueLeft,
|
||||
|
||||
String configStringValueRight,
|
||||
Boolean configBooleanValueRight,
|
||||
Integer configIntegerValueRight,
|
||||
Double configDoubleValueRight,
|
||||
List<String> configListValueRight,
|
||||
|
||||
Boolean pluginReloadEnable,
|
||||
String pluginReloadCommand) {
|
||||
this.empty = empty;
|
||||
this.itemAmount = itemAmount;
|
||||
this.playerHead_Enable = playerHead_Enable;
|
||||
this.base64_Enable = base64Value_Enable;
|
||||
this.base64Value = base64Value;
|
||||
this.playerWhoHasOpenedTheGUI = playerWhoHasOpenedTheGUI;
|
||||
this.playerName = playerName;
|
||||
this.item = item;
|
||||
this.name = name;
|
||||
this.lore = lore;
|
||||
this.customSound_Enable = customSound_Enable;
|
||||
this.customSound_NoSound = customSound_NoSound;
|
||||
this.customSound_Sound = customSound_Sound;
|
||||
this.cost_Enable = cost_Enable;
|
||||
this.price = price;
|
||||
this.command_Enable = command_Enable;
|
||||
this.command_BungeeCommand = command_BungeeCommand;
|
||||
this.commandAsConsole = commandAsConsole;
|
||||
this.command = command;
|
||||
this.serverChange = serverChange;
|
||||
this.serverChangeServer = serverChangeServer;
|
||||
this.openGUI_Enable = openGUI_Enable;
|
||||
this.openGUI = openGUI;
|
||||
this.togglePermission = togglePermission;
|
||||
this.togglePermissionPerm = togglePermissionPerm;
|
||||
this.toggleUseItem = toggleUseItem;
|
||||
this.message_Enable = message_Enable;
|
||||
this.message = message;
|
||||
this.setConfigEnable = setConfigEnable;
|
||||
this.configFilePath = configFilePath;
|
||||
this.configOptionPath = configOptionPath;
|
||||
this.configOptionPremat = configOptionPremat;
|
||||
// this.ConfigChatInput = ConfigChatInput;
|
||||
|
||||
this.configStringValueLeft = configStringValueLeft;
|
||||
this.configBooleanValueLeft = configBooleanValueLeft;
|
||||
this.configIntegerValueLeft = configIntegerValueLeft;
|
||||
this.configDoubleValueLeft = configDoubleValueLeft;
|
||||
this.configListValueLeft = configListValueLeft;
|
||||
|
||||
this.configStringValueRight = configStringValueRight;
|
||||
this.configBooleanValueRight = configBooleanValueRight;
|
||||
this.configIntegerValueRight = configIntegerValueRight;
|
||||
this.configDoubleValueRight = configDoubleValueRight;
|
||||
this.configListValueRight = configListValueRight;
|
||||
|
||||
|
||||
this.pluginReloadEnable = pluginReloadEnable;
|
||||
this.pluginReloadCommand = pluginReloadCommand;
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package de.jatitv.commandguiv2.Spigot.objects.guis;
|
||||
|
||||
import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Gui {
|
||||
public Boolean GUI_Enable;
|
||||
public Integer GUI_Lines;
|
||||
public String GUI_Name;
|
||||
public Boolean GUI_FillItem_Enable;
|
||||
public String GUI_FillItem_Item;
|
||||
|
||||
|
||||
public String Command_Command;
|
||||
public Boolean Command_Alias_Enable;
|
||||
public Boolean Command_Permission_Enable;
|
||||
public ArrayList<Slot> slots;
|
||||
|
||||
public Gui(Boolean GUI_Enable, Integer GUI_Lines, String GUI_Name, Boolean GUI_FillItem_Enable, String GUI_FillItem_Item,
|
||||
String Command_Command, Boolean Command_Alias_Enable, Boolean Command_Permission_Enable, ArrayList<Slot> slots){
|
||||
this.GUI_Enable = GUI_Enable;
|
||||
this.GUI_Lines = GUI_Lines;
|
||||
this.GUI_Name = GUI_Name;
|
||||
this.GUI_FillItem_Enable = GUI_FillItem_Enable;
|
||||
this.GUI_FillItem_Item = GUI_FillItem_Item;
|
||||
this.Command_Command = Command_Command;
|
||||
this.Command_Alias_Enable = Command_Alias_Enable;
|
||||
this.Command_Permission_Enable = Command_Permission_Enable;
|
||||
this.slots = slots;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package de.jatitv.commandguiv2.Spigot.objects.slots;
|
||||
|
||||
public class Slot {
|
||||
|
||||
public Integer slot;
|
||||
public Boolean enable;
|
||||
public String function;
|
||||
public Boolean permission;
|
||||
public String permissionToSee;
|
||||
public String permissionToUse;
|
||||
|
||||
|
||||
public Slot(Integer slot,
|
||||
Boolean enable,
|
||||
String function,
|
||||
Boolean permission,
|
||||
String permissionToSee,
|
||||
String permissionToUse
|
||||
) {
|
||||
this.slot = slot;
|
||||
this.enable = enable;
|
||||
this.function = function;
|
||||
this.permission = permission;
|
||||
this.permissionToSee = permissionToSee;
|
||||
this.permissionToUse = permissionToUse;
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user