Compare commits
1 Commits
1.2.0_beta
...
1.1.8
Author | SHA1 | Date | |
---|---|---|---|
3e24492bfa |
7
pom.xml
7
pom.xml
@@ -6,8 +6,7 @@
|
||||
|
||||
<groupId>net.t2code</groupId>
|
||||
<artifactId>Alias</artifactId>
|
||||
|
||||
<version>1.2.0_snapshot-1</version>
|
||||
<version>1.1.8</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>T2C-Alias</name>
|
||||
@@ -20,7 +19,7 @@
|
||||
<url>T2Code.net</url>
|
||||
|
||||
<build>
|
||||
<finalName>${project.name}_${project.version}</finalName>
|
||||
<finalName>${project.artifactId}_${project.version}</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@@ -71,7 +70,7 @@
|
||||
<dependency>
|
||||
<groupId>net.t2code</groupId>
|
||||
<artifactId>T2CodeLib</artifactId>
|
||||
<version>14.4</version>
|
||||
<version>14.2</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@@ -34,12 +34,6 @@ public class AliasCmdExecuter implements CommandExecutor, TabCompleter {
|
||||
} else T2Csend.sender(sender, SelectMessages.noPermissionForCommand.replace("[cmd]", "/t2code-alias reload")
|
||||
.replace("[perm]", "t2code.alias.command.reload"));
|
||||
break;
|
||||
case "confirm":
|
||||
ExecuteAlias.storage(sender, true);
|
||||
break;
|
||||
case "cancel":
|
||||
ExecuteAlias.storage(sender, false);
|
||||
break;
|
||||
case "info":
|
||||
case "plugin":
|
||||
case "version":
|
||||
|
@@ -3,7 +3,6 @@ package net.t2code.alias.Spigot.cmdManagement;
|
||||
import net.t2code.alias.Spigot.config.config.SelectConfig;
|
||||
import net.t2code.alias.Spigot.config.languages.SelectMessages;
|
||||
import net.t2code.alias.Spigot.objects.AliasObject;
|
||||
import net.t2code.alias.Spigot.objects.AliasStorageObject;
|
||||
import net.t2code.alias.Spigot.objects.SubAliasObject;
|
||||
import net.t2code.alias.Spigot.system.BCommandSenderReciver;
|
||||
import net.t2code.alias.Util;
|
||||
@@ -13,42 +12,17 @@ import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
|
||||
import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
|
||||
import net.t2code.t2codelib.SPIGOT.api.plugins.T2CpluginCheck;
|
||||
import net.t2code.t2codelib.SPIGOT.api.yaml.T2CLibConfig;
|
||||
import net.t2code.t2codelib.SPIGOT.api.yaml.T2Cconfig;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ExecuteAlias {
|
||||
|
||||
public static HashMap<UUID, AliasStorageObject> aliasStorage = new HashMap<>();
|
||||
|
||||
private static final String prefix = Util.getPrefix();
|
||||
|
||||
protected static void storage(CommandSender sender, boolean confirm) {
|
||||
Player player = (Player) sender;
|
||||
|
||||
if (!aliasStorage.containsKey(player.getUniqueId())) {
|
||||
T2Csend.player(player, SelectMessages.buyConfirmNotPossible);
|
||||
return;
|
||||
}
|
||||
|
||||
AliasStorageObject object = aliasStorage.get(player.getUniqueId());
|
||||
aliasStorage.remove(player.getUniqueId());
|
||||
|
||||
if (!confirm) {
|
||||
T2Csend.player(player, SelectMessages.buyCancel);
|
||||
return;
|
||||
}
|
||||
|
||||
if (object.sub) {
|
||||
executeSubAlias(player, (SubAliasObject) object.aliasObject, object.alias, object.args);
|
||||
} else executeAlias(player, (AliasObject) object.aliasObject, object.alias, object.args);
|
||||
}
|
||||
|
||||
protected static void aliasPlayer(CommandSender sender, AliasObject aliasObject, String alias, String[] args) {
|
||||
Player player = (Player) sender;
|
||||
|
||||
@@ -75,26 +49,13 @@ public class ExecuteAlias {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (aliasObject.costEnable && aliasObject.costConfirm) {
|
||||
if (!(aliasObject.costAllowBypass && player.hasPermission("t2code.alias.buy.bypass"))) {
|
||||
T2Csend.player(player, SelectMessages.buyConfirm.replace("[price]", aliasObject.costPrice.toString() + " " + SelectConfig.getBuyCurrency()));
|
||||
aliasStorage.put(player.getUniqueId(), new AliasStorageObject(aliasObject, alias, args, false));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
executeAlias(player, aliasObject, alias, args);
|
||||
}
|
||||
|
||||
protected static void executeAlias(Player player, AliasObject aliasObject, String alias, String[] args) {
|
||||
if (aliasObject.costEnable) {
|
||||
if (!(aliasObject.costAllowBypass && player.hasPermission("t2code.alias.buy.bypass"))) {
|
||||
if (!T2Ceco.moneyRemove(prefix, player, aliasObject.costPrice)) {
|
||||
T2Csend.player(player, SelectMessages.noMoney);
|
||||
return;
|
||||
}
|
||||
if (SelectConfig.getBuyMessage())
|
||||
T2Csend.player(player, SelectMessages.buy.replace("[price]", aliasObject.costPrice.toString() + " " + SelectConfig.getBuyCurrency()));
|
||||
if (SelectConfig.getBuyMessage()) T2Csend.player(player, SelectMessages.buy.replace("[price]", aliasObject.costPrice.toString()));
|
||||
}
|
||||
}
|
||||
if (aliasObject.commandEnable) {
|
||||
@@ -117,7 +78,7 @@ public class ExecuteAlias {
|
||||
if (aliasObject.adminEnable) {
|
||||
if (player.hasPermission(aliasObject.adminPermission)) {
|
||||
if (aliasObject.adminCommandEnable) {
|
||||
subAliasAdminCommand(aliasObject, alias, player, args);
|
||||
subAliasAdminCommand(aliasObject,alias, player, args);
|
||||
}
|
||||
if (aliasObject.adminMessageEnable) {
|
||||
subAliasAdminMessage(aliasObject, alias, player, args);
|
||||
@@ -137,31 +98,13 @@ public class ExecuteAlias {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (aliasObject.costEnable && aliasObject.costConfirm) {
|
||||
if (!(aliasObject.costAllowBypass && player.hasPermission("t2code.alias.buy.bypass"))) {
|
||||
T2Csend.player(player, SelectMessages.buyConfirm.replace("[price]", aliasObject.costPrice.toString() + " " + SelectConfig.getBuyCurrency()));
|
||||
aliasStorage.put(player.getUniqueId(), new AliasStorageObject(aliasObject, alias, args, true));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
executeSubAlias(player, aliasObject, alias, args);
|
||||
} else {
|
||||
if (aliasObject.consoleEnable) {
|
||||
subAliasConsole(aliasObject, alias, sender, args);
|
||||
} else T2Csend.sender(sender, SelectMessages.onlyForPlayer);
|
||||
}
|
||||
}
|
||||
|
||||
protected static void executeSubAlias(Player player, SubAliasObject aliasObject, String alias, String[] args) {
|
||||
if (aliasObject.costEnable) {
|
||||
if (!(aliasObject.costAllowBypass && player.hasPermission("t2code.alias.buy.bypass"))) {
|
||||
if (!T2Ceco.moneyRemove(prefix, player, aliasObject.costPrice)) {
|
||||
T2Csend.player(player, SelectMessages.noMoney);
|
||||
return;
|
||||
}
|
||||
if (SelectConfig.getBuyMessage())
|
||||
T2Csend.player(player, SelectMessages.buy.replace("[price]", aliasObject.costPrice.toString() + " " + SelectConfig.getBuyCurrency()));
|
||||
if (SelectConfig.getBuyMessage()) T2Csend.player(player, SelectMessages.buy.replace("[price]", aliasObject.costPrice.toString()));
|
||||
}
|
||||
}
|
||||
if (aliasObject.commandEnable) {
|
||||
@@ -170,6 +113,11 @@ public class ExecuteAlias {
|
||||
if (aliasObject.messageEnable) {
|
||||
subAliasMessage(aliasObject, alias, player, args);
|
||||
}
|
||||
} else {
|
||||
if (aliasObject.consoleEnable) {
|
||||
subAliasConsole(aliasObject,alias, sender, args);
|
||||
} else T2Csend.sender(sender, SelectMessages.onlyForPlayer);
|
||||
}
|
||||
}
|
||||
|
||||
protected static void aliasConsole(AliasObject alias, CommandSender sender, String prefix) {
|
||||
|
@@ -55,15 +55,4 @@ public class AliasConfigConverter {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public static void convertAddCostConfirm(YamlConfiguration yamlConfiguration, File config_gui, Boolean subalias) {
|
||||
if (subalias) {
|
||||
yamlConfiguration.set("SubAlias.Cost.Confirm", false);
|
||||
} else yamlConfiguration.set("Alias.Cost.Confirm", false);
|
||||
try {
|
||||
yamlConfiguration.save(config_gui);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -28,7 +28,6 @@ public class CreateExampleAliasConfig {
|
||||
T2Cconfig.set("Alias.Permission.CustomNoPermissionMSG", "", yamlConfiguration);
|
||||
|
||||
T2Cconfig.set("Alias.Cost.Enable", false,yamlConfiguration);
|
||||
T2Cconfig.set("Alias.Cost.Confirm", true,yamlConfiguration);
|
||||
T2Cconfig.set("Alias.Cost.Price", 0.0,yamlConfiguration);
|
||||
T2Cconfig.set("Alias.Cost.AllowByPass", true,yamlConfiguration);
|
||||
|
||||
|
@@ -66,10 +66,6 @@ public class SelectAlias {
|
||||
String permissionMSG = yamlConfiguration.getString("Alias.Permission.CustomNoPermissionMSG");
|
||||
|
||||
Boolean costEnable = yamlConfiguration.getBoolean("Alias.Cost.Enable");
|
||||
if (yamlConfiguration.get("Alias.Cost.Confirm") == null) {
|
||||
AliasConfigConverter.convertAddCostConfirm(yamlConfiguration, config_gui, false);
|
||||
}
|
||||
Boolean costConfirm = yamlConfiguration.getBoolean("Alias.Cost.Confirm");
|
||||
Double costPrice = yamlConfiguration.getDouble("Alias.Cost.Price");
|
||||
Boolean costAllowBypass = yamlConfiguration.getBoolean("Alias.Cost.AllowByPass");
|
||||
|
||||
@@ -100,7 +96,7 @@ public class SelectAlias {
|
||||
List<String> consoleMessages = yamlConfiguration.getStringList("Alias.Console.Message.Messages");
|
||||
|
||||
Main.allAliases.addAll(aliasList);
|
||||
AliasObject alias = new AliasObject(aliasEnable, aliasList, permNecessary, permission, permissionMSG, costEnable, costConfirm, costPrice, costAllowBypass, commandEnable, commandAsConsole, bungeeCommand,
|
||||
AliasObject alias = new AliasObject(aliasEnable, aliasList, permNecessary, permission, permissionMSG, costEnable, costPrice, costAllowBypass, commandEnable, commandAsConsole, bungeeCommand,
|
||||
command, messageEnable, messages, adminEnable, adminPermission, adminCommandEnable, adminCommandAsConsole, adminBungeeCommand, adminCommands,
|
||||
adminMessageEnable, adminMessages, consoleEnable, consoleCommandEnable, consoleBungeeCommand, consoleCommands, consoleMessageEnable, consoleMessages);
|
||||
for (String al : aliasList) {
|
||||
|
@@ -11,6 +11,7 @@ import java.io.IOException;
|
||||
|
||||
public class CreateConfig {
|
||||
|
||||
|
||||
public static void configCreate() {
|
||||
long long_ = System.currentTimeMillis();
|
||||
if (new File(Main.getPath(), "config.yml").exists()) {
|
||||
@@ -21,16 +22,19 @@ public class CreateConfig {
|
||||
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
|
||||
|
||||
|
||||
if (yamlConfiguration.contains("ConfigVersion") && yamlConfiguration.getInt("ConfigVersion") < 4) {
|
||||
convert();
|
||||
return;
|
||||
}
|
||||
|
||||
T2Cconfig.set("plugin.language", "english", yamlConfiguration);
|
||||
T2Cconfig.set("plugin.updateCheck.onJoin", true, yamlConfiguration);
|
||||
T2Cconfig.set("plugin.updateCheck.seePreReleaseUpdates", true, yamlConfiguration);
|
||||
T2Cconfig.set("plugin.updateCheck.timeInterval", 60, yamlConfiguration);
|
||||
|
||||
T2Cconfig.set("buy.message", true, yamlConfiguration);
|
||||
T2Cconfig.set("buy.currency", "$", yamlConfiguration);
|
||||
T2Cconfig.set("subAlias.tabComplete", true, yamlConfiguration);
|
||||
|
||||
|
||||
try {
|
||||
yamlConfiguration.save(config);
|
||||
} catch (IOException e) {
|
||||
@@ -42,7 +46,6 @@ public class CreateConfig {
|
||||
private static void convert() {
|
||||
File configOld = new File(Main.getPath(), "config.yml");
|
||||
configOld.renameTo(new File(Main.getPath(), "configV3.yml"));
|
||||
configOld = new File(Main.getPath(), "configV3.yml");
|
||||
YamlConfiguration yamlConfigurationOld = YamlConfiguration.loadConfiguration(configOld);
|
||||
|
||||
File config = new File(Main.getPath(), "config.yml");
|
||||
|
@@ -8,7 +8,7 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
public class SelectConfig {
|
||||
private static Integer ConfigVersion = 3;
|
||||
private static Integer ConfigVersion = 4;
|
||||
private static Integer isConfigVersion;
|
||||
private static Boolean updateCheckOnJoin;
|
||||
private static Boolean updateCheckSeePreReleaseUpdates;
|
||||
@@ -16,14 +16,13 @@ public class SelectConfig {
|
||||
private static String language;
|
||||
|
||||
private static Boolean buyMessage;
|
||||
private static String buyCurrency;
|
||||
private static Boolean subAliasTab;
|
||||
|
||||
public static void onSelect() {
|
||||
File config = new File(Main.getPath(), "config.yml");
|
||||
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
|
||||
|
||||
isConfigVersion = yamlConfiguration.getInt("ConfigVersion");
|
||||
isConfigVersion = yamlConfiguration.getInt("configVersion");
|
||||
|
||||
updateCheckOnJoin = yamlConfiguration.getBoolean("plugin.updateCheck.onJoin");
|
||||
updateCheckSeePreReleaseUpdates = yamlConfiguration.getBoolean("plugin.updateCheck.seePreReleaseUpdates");
|
||||
@@ -32,13 +31,12 @@ public class SelectConfig {
|
||||
language = yamlConfiguration.getString("plugin.language");
|
||||
|
||||
buyMessage = yamlConfiguration.getBoolean("buy.message");
|
||||
buyCurrency = yamlConfiguration.getString("buy.currency");
|
||||
subAliasTab = yamlConfiguration.getBoolean("subAlias.tabComplete");
|
||||
}
|
||||
public static void setConfigVersion() {
|
||||
File config = new File(Main.getPath(), "config.yml");
|
||||
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
|
||||
yamlConfiguration.set("ConfigVersion", ConfigVersion);
|
||||
yamlConfiguration.set("configVersion", ConfigVersion);
|
||||
try {
|
||||
yamlConfiguration.save(config);
|
||||
} catch (IOException e) {
|
||||
@@ -70,15 +68,10 @@ public class SelectConfig {
|
||||
return language;
|
||||
}
|
||||
|
||||
|
||||
public static Boolean getBuyMessage() {
|
||||
return buyMessage;
|
||||
}
|
||||
|
||||
public static String getBuyCurrency() {
|
||||
return buyCurrency;
|
||||
}
|
||||
|
||||
public static Boolean getSubAliasTab() {
|
||||
return subAliasTab;
|
||||
}
|
||||
|
@@ -32,9 +32,6 @@ public class LanguagesCreate {
|
||||
T2Cconfig.set("Plugin.NoSubCommand", MSG.EN_NoSubCommand, yamlConfigurationEN);
|
||||
|
||||
T2Cconfig. set("Cost.Buy", MSG.EN_Buy, yamlConfigurationEN);
|
||||
T2Cconfig. set("Cost.BuyConfirm", MSG.EN_BuyConfirm, yamlConfigurationEN);
|
||||
T2Cconfig. set("Cost.BuyCancel", MSG.EN_BuyCancel, yamlConfigurationEN);
|
||||
T2Cconfig. set("Cost.BuyConfirmNotPossible", MSG.EN_BuyConfirmNotPossible, yamlConfigurationEN);
|
||||
T2Cconfig.set("Cost.NoMoney", MSG.EN_NoMoney, yamlConfigurationEN);
|
||||
|
||||
try {
|
||||
@@ -62,9 +59,6 @@ public class LanguagesCreate {
|
||||
T2Cconfig.set("Plugin.NoSubCommand", MSG.DE_NoSubCommand, yamlConfigurationDE);
|
||||
|
||||
T2Cconfig.set("Cost.Buy", MSG.DE_Buy, yamlConfigurationDE);
|
||||
T2Cconfig.set("Cost.BuyConfirm", MSG.DE_BuyConfirm, yamlConfigurationDE);
|
||||
T2Cconfig.set("Cost.BuyCancel", MSG.DE_BuyCancel, yamlConfigurationDE);
|
||||
T2Cconfig.set("Cost.BuyConfirmNotPossible", MSG.DE_BuyConfirmNotPossible, yamlConfigurationDE);
|
||||
T2Cconfig.set("Cost.NoMoney", MSG.DE_NoMoney, yamlConfigurationDE);
|
||||
|
||||
try {
|
||||
|
@@ -25,10 +25,6 @@ public class MSG {
|
||||
public static String EN_NoPermissionForCommand = "[prefix] <red>For <aqua>[cmd]</aqua> you lack the permission <gold>[perm]</gold>!</red>";
|
||||
|
||||
public static String EN_Buy = "[prefix] <dark_green>You have paid <gold>[price]</gold> for this command.</dark_green>";
|
||||
public static String EN_BuyConfirm = "[prefix] <gold>For this command you have to pay [price]!</gold><br>[prefix] <green><click:run_command:'/t2c-a confirm'>" +
|
||||
"<hover:show_text:'<gray>Click to confirm</gray>'>Confirm</hover></click></green> <gray>-</gray> <red><click:run_command:'/t2c-a cancel'><hover:show_text:'<gray>click to cancel</gray>'>Cancel</hover></click></red>";
|
||||
public static String EN_BuyCancel = "[prefix] <gold>The command was canceled and you do not have to pay anything!</gold>";
|
||||
public static String EN_BuyConfirmNotPossible = "[prefix] <gold>Confirmation not possible, you have not executed a payable command.</gold>";
|
||||
public static String EN_NoMoney = "[prefix] <red>You don't have enough money for this command!</red>";
|
||||
public static String EN_NoSubCommand = "[prefix] <red>This command does not exist!</red>";
|
||||
|
||||
@@ -44,10 +40,6 @@ public class MSG {
|
||||
public static String DE_NoPermissionForCommand = "[prefix] <red>F[ue]r <aqua>[cmd]</aqua> fehlt dir die Permission <gold>[perm]</gold>!</red>";
|
||||
|
||||
public static String DE_Buy = "[prefix] <dark_green>Du hast f[ue]r diesen Command <gold>[price]</gold> bezahlt.</dark_green>";
|
||||
public static String DE_BuyConfirm = "[prefix] <gold>Für diesen Befehl musst du [price] bezahlen!</gold><br>[prefix] <green><click:run_command:'/t2c-a confirm'>" +
|
||||
"<hover:show_text:'<gray>Klicke zum bestätigen</gray>'>Bestätigen</hover></click></green> <gray>-</gray> <red><click:run_command:'/t2c-a cancel'><hover:show_text:'<gray>Klicke zum abbrechen</gray>'>Abbrechen</hover></click></red>";
|
||||
public static String DE_BuyCancel = "[prefix] <gold>Der befehl wurde abgebrochen und du musst nichts bezahlen!</gold>";
|
||||
public static String DE_BuyConfirmNotPossible = "[prefix] <gold>Bestätigen nicht möglich, du hast keinen bezahlungspflichtigen befehl ausgeführt.</gold>";
|
||||
public static String DE_NoMoney = "[prefix] <red>Du hast nicht gen[ue]gend Geld für diesen Command!</red>";
|
||||
|
||||
public static String DE_NoSubCommand = "[prefix] <red>Diesen Befehl gibt es nicht!</red>";
|
||||
|
@@ -21,9 +21,6 @@ public class SelectMessages {
|
||||
public static String aliasDisabled;
|
||||
|
||||
public static String buy;
|
||||
public static String buyConfirm;
|
||||
public static String buyCancel;
|
||||
public static String buyConfirmNotPossible;
|
||||
public static String noMoney;
|
||||
|
||||
|
||||
@@ -57,9 +54,6 @@ public class SelectMessages {
|
||||
noPermissionForCommand = replace(yamlConfiguration.getString("Plugin.ForCommand"));
|
||||
noSubCommand = replace(yamlConfiguration.getString("Plugin.NoSubCommand"));
|
||||
buy = replace(yamlConfiguration.getString("Cost.Buy"));
|
||||
buyConfirm = replace(yamlConfiguration.getString("Cost.BuyConfirm"));
|
||||
buyCancel = replace(yamlConfiguration.getString("Cost.BuyCancel"));
|
||||
buyConfirmNotPossible = replace(yamlConfiguration.getString("Cost.BuyConfirmNotPossible"));
|
||||
noMoney = replace(yamlConfiguration.getString("Cost.NoMoney"));
|
||||
|
||||
T2Csend.console(Prefix + " §2Language successfully selected to: §6" + selectMSG + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
|
||||
|
@@ -29,7 +29,6 @@ public class CreateExampleSubAliasConfig {
|
||||
T2Cconfig.set("SubAlias.Permission.CustomNoPermissionMSG", "", yamlConfiguration);
|
||||
|
||||
T2Cconfig.set("SubAlias.Cost.Enable", false, yamlConfiguration);
|
||||
T2Cconfig.set("SubAlias.Cost.Confirm", true,yamlConfiguration);
|
||||
T2Cconfig.set("SubAlias.Cost.Price", 0.0, yamlConfiguration);
|
||||
T2Cconfig.set("SubAlias.Cost.AllowByPass", true, yamlConfiguration);
|
||||
|
||||
|
@@ -67,10 +67,6 @@ public class SelectSubAlias {
|
||||
String permissionMSG = yamlConfiguration.getString("SubAlias.Permission.CustomNoPermissionMSG");
|
||||
|
||||
Boolean costEnable = yamlConfiguration.getBoolean("SubAlias.Cost.Enable");
|
||||
if (yamlConfiguration.get("SubAlias.Cost.Confirm") == null) {
|
||||
AliasConfigConverter.convertAddCostConfirm(yamlConfiguration, config_gui, true);
|
||||
}
|
||||
Boolean costConfirm = yamlConfiguration.getBoolean("SubAlias.Cost.Confirm");
|
||||
Double costPrice = yamlConfiguration.getDouble("SubAlias.Cost.Price");
|
||||
Boolean costAllowBypass = yamlConfiguration.getBoolean("SubAlias.Cost.AllowByPass");
|
||||
|
||||
@@ -100,7 +96,7 @@ public class SelectSubAlias {
|
||||
Boolean consoleMessageEnable = yamlConfiguration.getBoolean("SubAlias.Console.Message.Enable");
|
||||
List<String> consoleMessages = yamlConfiguration.getStringList("SubAlias.Console.Message.Messages");
|
||||
|
||||
SubAliasObject subAlias = new SubAliasObject(aliasEnable, subAliasList, subAliasFor, subAliasArg, permNecessary, permission, permissionMSG, costEnable,costConfirm, costPrice, costAllowBypass, commandEnable, commandAsConsole, bungeeCommand,
|
||||
SubAliasObject subAlias = new SubAliasObject(aliasEnable, subAliasList, subAliasFor, subAliasArg, permNecessary, permission, permissionMSG, costEnable, costPrice, costAllowBypass, commandEnable, commandAsConsole, bungeeCommand,
|
||||
command, messageEnable, messages, adminEnable, adminPermission, adminCommandEnable, adminCommandAsConsole, adminBungeeCommand, adminCommands,
|
||||
adminMessageEnable, adminMessages, consoleEnable, consoleCommandEnable, consoleBungeeCommand, consoleCommands, consoleMessageEnable, consoleMessages);
|
||||
for (String sal : subAliasList) {
|
||||
|
@@ -1,24 +0,0 @@
|
||||
package net.t2code.alias.Spigot.listener;
|
||||
|
||||
import net.t2code.alias.Spigot.Main;
|
||||
import net.t2code.alias.Spigot.cmdManagement.ExecuteAlias;
|
||||
import net.t2code.alias.Util;
|
||||
import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerLoginEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
|
||||
public class PluginEvents implements Listener {
|
||||
@EventHandler
|
||||
public void onJoinEvent(PlayerQuitEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
ExecuteAlias.aliasStorage.remove(player.getUniqueId());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onJoinEvent(PlayerLoginEvent event) {
|
||||
T2CupdateAPI.join(Main.getPlugin(), Util.getPrefix(), "t2code.alias.updatemsg", event.getPlayer(), Util.getSpigotID(), Util.getDiscord());
|
||||
}
|
||||
}
|
@@ -11,7 +11,6 @@ public class AliasObject {
|
||||
public String permissionMSG;
|
||||
|
||||
public Boolean costEnable;
|
||||
public Boolean costConfirm;
|
||||
public Double costPrice;
|
||||
public Boolean costAllowBypass;
|
||||
|
||||
@@ -45,7 +44,6 @@ public class AliasObject {
|
||||
String permissionMSG,
|
||||
|
||||
Boolean costEnable,
|
||||
Boolean costConfirm,
|
||||
Double costPrice,
|
||||
Boolean costAllowBypass,
|
||||
|
||||
@@ -78,7 +76,6 @@ public class AliasObject {
|
||||
this.permissionMSG = permissionMSG;
|
||||
|
||||
this.costEnable = costEnable;
|
||||
this.costConfirm = costConfirm;
|
||||
this.costPrice = costPrice;
|
||||
this.costAllowBypass = costAllowBypass;
|
||||
|
||||
|
@@ -1,15 +0,0 @@
|
||||
package net.t2code.alias.Spigot.objects;
|
||||
|
||||
public class AliasStorageObject {
|
||||
public Object aliasObject;
|
||||
public String alias;
|
||||
public String[] args;
|
||||
public boolean sub;
|
||||
|
||||
public AliasStorageObject( Object aliasObject, String alias, String[] args, boolean sub) {
|
||||
this.aliasObject = aliasObject;
|
||||
this.alias = alias;
|
||||
this.args = args;
|
||||
this.sub=sub;
|
||||
}
|
||||
}
|
@@ -13,7 +13,6 @@ public class SubAliasObject {
|
||||
public String permissionMSG;
|
||||
|
||||
public Boolean costEnable;
|
||||
public Boolean costConfirm;
|
||||
public Double costPrice;
|
||||
public Boolean costAllowBypass;
|
||||
|
||||
@@ -49,7 +48,6 @@ public class SubAliasObject {
|
||||
String permissionMSG,
|
||||
|
||||
Boolean costEnable,
|
||||
Boolean costConfirm,
|
||||
Double costPrice,
|
||||
Boolean costAllowBypass,
|
||||
|
||||
@@ -84,7 +82,6 @@ public class SubAliasObject {
|
||||
this.permissionMSG = permissionMSG;
|
||||
|
||||
this.costEnable = costEnable;
|
||||
this.costConfirm = costConfirm;
|
||||
this.costPrice = costPrice;
|
||||
this.costAllowBypass = costAllowBypass;
|
||||
|
||||
|
18
src/main/java/net/t2code/alias/Spigot/system/JoinEvent.java
Normal file
18
src/main/java/net/t2code/alias/Spigot/system/JoinEvent.java
Normal file
@@ -0,0 +1,18 @@
|
||||
// This claas was created by JaTiTV
|
||||
|
||||
package net.t2code.alias.Spigot.system;
|
||||
|
||||
import net.t2code.alias.Spigot.Main;
|
||||
import net.t2code.alias.Util;
|
||||
import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerLoginEvent;
|
||||
|
||||
public class JoinEvent implements Listener {
|
||||
|
||||
@EventHandler
|
||||
public void onJoinEvent(PlayerLoginEvent event) {
|
||||
T2CupdateAPI.join(Main.getPlugin(),Util.getPrefix(), "t2code.alias.updatemsg", event.getPlayer(), Util.getSpigotID(), Util.getDiscord());
|
||||
}
|
||||
}
|
@@ -10,7 +10,6 @@ import net.t2code.alias.Spigot.config.languages.LanguagesCreate;
|
||||
import net.t2code.alias.Spigot.config.languages.SelectMessages;
|
||||
import net.t2code.alias.Spigot.config.subAlias.CreateExampleSubAliasConfig;
|
||||
import net.t2code.alias.Spigot.config.subAlias.SelectSubAlias;
|
||||
import net.t2code.alias.Spigot.listener.PluginEvents;
|
||||
import net.t2code.alias.Util;
|
||||
import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate;
|
||||
import net.t2code.t2codelib.SPIGOT.api.register.T2Cregister;
|
||||
@@ -28,11 +27,11 @@ public class Load {
|
||||
Long long_ = T2Ctemplate.onLoadHeader(prefix, autor, version, spigot, discord);
|
||||
plugin.getCommand("t2code-alias").setExecutor(new AliasCmdExecuter());
|
||||
loadReload();
|
||||
T2CupdateAPI.onUpdateCheck(plugin, prefix, Util.getGit(), Util.getSpigotID(), Util.getDiscord(),
|
||||
SelectConfig.getUpdateCheckOnJoin(), SelectConfig.getUpdateCheckSeePreReleaseUpdates(), SelectConfig.getUpdateCheckTimeInterval());
|
||||
T2CupdateAPI.onUpdateCheck(plugin,prefix,Util.getGit(),Util.getSpigotID(),Util.getDiscord(),
|
||||
SelectConfig.getUpdateCheckOnJoin(),SelectConfig.getUpdateCheckSeePreReleaseUpdates(),SelectConfig.getUpdateCheckTimeInterval());
|
||||
Bukkit.getServer().getPluginManager().registerEvents(new JoinEvent(), plugin);
|
||||
|
||||
T2Ctemplate.onLoadFooter(prefix, long_, version);
|
||||
T2Cregister.listener(new PluginEvents(), plugin);
|
||||
Metrics.Bstats(plugin, bstatsID);
|
||||
}
|
||||
|
||||
|
@@ -8,7 +8,7 @@ public class Util {
|
||||
}
|
||||
|
||||
public static String getRequiredT2CodeLibVersion() {
|
||||
return "13.4";
|
||||
return "14.2";
|
||||
}
|
||||
|
||||
public static String getPrefix() {
|
||||
|
Reference in New Issue
Block a user