ChromaGaming/ChromaCore
1
0
Fork 0
Code Issues 23 Pull requests 1 Projects Releases 11 Packages Wiki Activity

New command system improvements, broadcast toggles, config fixes #62

Merged
NorbiPeti merged 23 commits from dev into master 2019-03-17 01:27:43 +00:00
Conversation 0 Commits 23 Files changed 43 +4 -1
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c62424389f - Show all commits

1
ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
View file

@ -93,6 +93,7 @@ public class MainPlugin extends ButtonPlugin {
Component.registerComponent(this, new VotifierComponent(economy));
ComponentManager.enableComponents();
getCommand2MC().registerCommand(new ComponentCommand());
getCommand2MC().registerCommand(new ThorpeCommand());
TBMCCoreAPI.RegisterEventsForExceptions(new PlayerListener(), this);
ChromaGamerBase.addConverter(commandSender -> Optional.ofNullable(commandSender instanceof ConsoleCommandSender || commandSender instanceof BlockCommandSender
? TBMCPlayer.getPlayer(new UUID(0, 0), TBMCPlayer.class) : null)); //Console & cmdblocks

4
ButtonCore/src/main/java/buttondevteam/lib/architecture/ButtonPlugin.java
View file

@ -19,6 +19,7 @@ public abstract class ButtonPlugin extends JavaPlugin {
private IHaveConfig iConfig;
@Getter(AccessLevel.PROTECTED)
private IHaveConfig data; //TODO
private boolean loaded = false;
/**
* Used to unregister components in the right order - and to reload configs
*/
@ -76,10 +77,11 @@ public abstract class ButtonPlugin extends JavaPlugin {
}
public void justReload() {
if (ConfigData.saveNow(getConfig())) {
if (loaded && ConfigData.saveNow(getConfig())) {
getLogger().warning("Saved pending configuration changes to the file, didn't reload (try again).");
return;
}
super.reloadConfig();
loaded = true; //Needed because for the first time it uses reloadConfig() to load it
}
}