Some fixes and cleanup
Don't require ButtonPlugin for unregistering components Cleanup Fixed not detecting missing player name
This commit is contained in:
parent
66be5ab0dc
commit
9fb35eb6cc
6 changed files with 7 additions and 25 deletions
|
@ -85,7 +85,6 @@ public class MainPlugin extends ButtonPlugin {
|
|||
|
||||
@Override
|
||||
public void pluginEnable() {
|
||||
// Logs "Plugin Enabled", registers commands
|
||||
Instance = this;
|
||||
PluginDescriptionFile pdf = getDescription();
|
||||
logger = getLogger();
|
||||
|
|
|
@ -31,12 +31,13 @@ public class PlayerListener implements Listener {
|
|||
public void OnPlayerJoin(PlayerJoinEvent event) {
|
||||
var p = event.getPlayer();
|
||||
TBMCPlayer player = TBMCPlayerBase.getPlayer(p.getUniqueId(), TBMCPlayer.class);
|
||||
if (player.PlayerName.get() == null) {
|
||||
String pname = player.PlayerName.get();
|
||||
if (pname.length() == 0) {
|
||||
player.PlayerName.set(p.getName());
|
||||
MainPlugin.Instance.getLogger().info("Player name saved: " + player.PlayerName.get());
|
||||
} else if (!p.getName().equals(player.PlayerName.get())) {
|
||||
TownyComponent.renameInTowny(player.PlayerName.get(), p.getName());
|
||||
MainPlugin.Instance.getLogger().info(player.PlayerName.get() + " renamed to " + p.getName());
|
||||
} else if (!p.getName().equals(pname)) {
|
||||
TownyComponent.renameInTowny(pname, p.getName());
|
||||
MainPlugin.Instance.getLogger().info(pname + " renamed to " + p.getName());
|
||||
player.PlayerName.set(p.getName());
|
||||
}
|
||||
}
|
||||
|
@ -69,10 +70,6 @@ public class PlayerListener implements Listener {
|
|||
|
||||
private void handlePreprocess(CommandSender sender, String message, Cancellable event) {
|
||||
if (event.isCancelled()) return;
|
||||
/*val cg = Optional.ofNullable(ChromaGamerBase.getFromSender(sender));
|
||||
val ch = cg.map(ChromaGamerBase::channel).map(ChannelPlayerData::get);
|
||||
val rtr = ch.map(c -> c.getRTR(sender)).orElseGet(() -> new Channel.RecipientTestResult("Failed to get user"));
|
||||
val ev = new TBMCCommandPreprocessEvent(sender, ch.orElse(Channel.GlobalChat), message, rtr.score, rtr.groupID);*/
|
||||
val cg = ChromaGamerBase.getFromSender(sender);
|
||||
if (cg == null) throw new RuntimeException("Couldn't get user from sender for " + sender.getName() + "!");
|
||||
val ev = new TBMCCommandPreprocessEvent(sender, cg.channel.get(), message, sender);
|
||||
|
|
|
@ -57,19 +57,13 @@ public class RestartComponent extends Component<MainPlugin> implements Listener
|
|||
private int syncStart(int hour) {
|
||||
var now = ZonedDateTime.now(ZoneId.ofOffset("", ZoneOffset.UTC));
|
||||
int secs = now.getHour() * 3600 + now.getMinute() * 60 + now.getSecond();
|
||||
//System.out.println("now: " + secs / 3600.);
|
||||
int diff = secs - hour * 3600;
|
||||
//System.out.println("diff: " + diff / 3600.);
|
||||
if (diff < 0) {
|
||||
diff += 24 * 3600;
|
||||
}
|
||||
//System.out.println("diff: " + diff / 3600.);
|
||||
int count = diff / (24 * 3600);
|
||||
//System.out.println("count: " + count);
|
||||
int intervalPart = diff - count * 24 * 3600;
|
||||
//System.out.println("intervalPart: " + intervalPart / 3600.);
|
||||
int remaining = 24 * 3600 - intervalPart;
|
||||
//System.out.println("remaining: " + remaining / 3600.);
|
||||
return remaining * 20;
|
||||
}
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ public abstract class Component<TP extends JavaPlugin> {
|
|||
* @param component The component to unregister
|
||||
* @return Whether the component is unregistered successfully (it also got disabled)
|
||||
*/
|
||||
public static <T extends ButtonPlugin> boolean unregisterComponent(T plugin, Component<T> component) {
|
||||
public static <T extends JavaPlugin> boolean unregisterComponent(T plugin, Component<T> component) {
|
||||
return registerUnregisterComponent(plugin, component, false);
|
||||
}
|
||||
|
||||
|
|
|
@ -119,7 +119,7 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
|
|||
protected final HashMap<String, SubcommandData<TC>> subcommands = new HashMap<>();
|
||||
protected final HashMap<Class<?>, ParamConverter<?>> paramConverters = new HashMap<>();
|
||||
|
||||
private ArrayList<String> commandHelp = new ArrayList<>(); //Mainly needed by Discord
|
||||
private final ArrayList<String> commandHelp = new ArrayList<>(); //Mainly needed by Discord
|
||||
|
||||
private char commandChar;
|
||||
|
||||
|
|
|
@ -193,11 +193,6 @@ public class Command2MC extends Command2<ICommand2MC, Command2MCSender> implemen
|
|||
int i = commandline.indexOf(' ');
|
||||
String mainpath = commandline.substring(1, i == -1 ? commandline.length() : i); //Without the slash
|
||||
PluginCommand pcmd;
|
||||
/*System.out.println("Command line: " + commandline);
|
||||
System.out.println("Prioritize: " + MainPlugin.Instance.prioritizeCustomCommands().get());
|
||||
System.out.println("PCMD: " + (pcmd = Bukkit.getPluginCommand(mainpath)));
|
||||
if (pcmd != null)
|
||||
System.out.println("ButtonPlugin: " + (pcmd.getPlugin() instanceof ButtonPlugin));*/
|
||||
if (!checkPlugin
|
||||
|| MainPlugin.Instance.prioritizeCustomCommands.get()
|
||||
|| (pcmd = Bukkit.getPluginCommand(mainpath)) == null //Our commands aren't PluginCommands
|
||||
|
@ -249,7 +244,6 @@ public class Command2MC extends Command2<ICommand2MC, Command2MCSender> implemen
|
|||
sender.sendMessage("§cAn internal error occurred.");
|
||||
return true;
|
||||
}
|
||||
//System.out.println("Executing " + label + " which is actually " + command.getName());
|
||||
handleCommand(new Command2MCSender(sender, user.channel.get(), sender),
|
||||
("/" + command.getName() + " " + String.join(" ", args)).trim(), false); ///trim(): remove space if there are no args
|
||||
return true;
|
||||
|
@ -267,13 +261,11 @@ public class Command2MC extends Command2<ICommand2MC, Command2MCSender> implemen
|
|||
|
||||
@Override
|
||||
public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
|
||||
//System.out.println("Correct tabcomplete queried");
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
|
||||
//System.out.println("Correct tabcomplete queried");
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue