Fixed plugin.yml
This commit is contained in:
parent
f37d1ad2c4
commit
15bd516096
7 changed files with 54 additions and 31 deletions
10
plugin.yml
10
plugin.yml
|
@ -4,7 +4,7 @@ version: 2.0.1
|
|||
|
||||
commands:
|
||||
flairme:
|
||||
description: Activates the Flair Me Command. Ask Ali, she was tired when writing this description
|
||||
description: Activates the Flair Me Command. Ask Ali - she was tired when writing this description
|
||||
gpower:
|
||||
description: Testing command for ghostie powers
|
||||
powerup:
|
||||
|
@ -16,9 +16,9 @@ commands:
|
|||
setalilink:
|
||||
description: Creates an Ali Link setalilink frequency
|
||||
cbgm0:
|
||||
description: Creative Boundaries Gamemode 0, allows players to return to survival
|
||||
description: Creative Boundaries Gamemode 0 - allows players to return to survival
|
||||
cbgm1:
|
||||
description: Creative Boundaries Gamemode 1, allows players to access creative within their towns. Creative is removed outside of towns, so be careful
|
||||
description: Creative Boundaries Gamemode 1 - allows players to access creative within their towns. Creative is removed outside of towns, so be careful
|
||||
setdickmode:
|
||||
description: Should players automatically return to creative when outside town borders? Dickmode says yes.
|
||||
joinminigame:
|
||||
|
@ -54,4 +54,6 @@ commands:
|
|||
startuhc:
|
||||
description: starts an ultrahardcore match
|
||||
starttimer:
|
||||
description: starts an ultrahardcore timer
|
||||
description: starts an ultrahardcore timer
|
||||
powerall:
|
||||
description: activate every player's power
|
|
@ -10,7 +10,6 @@ import alisolarflare.components.flairdoor.FlairDoorModule;
|
|||
import alisolarflare.components.links.AliLinkModule;
|
||||
import alisolarflare.creativeboundaries.CreativeBoundariesModule;
|
||||
import alisolarflare.easyuhc.EasyUHCModule;
|
||||
import alisolarflare.easyuhc.gpowers.GPowerModule;
|
||||
import alisolarflare.magic.MagicModule;
|
||||
import alisolarflare.minigames.MinigameModule;
|
||||
|
||||
|
@ -23,7 +22,6 @@ public class AliPresents extends JavaPlugin{
|
|||
|
||||
|
||||
new FlairDoorModule().register(this);
|
||||
new GPowerModule().register(this);
|
||||
new AliLinkModule().register(this);
|
||||
new EasyUHCModule().register(this);
|
||||
new MagicModule().register(this);
|
||||
|
|
|
@ -11,11 +11,25 @@ import alisolarflare.easyuhc.commands.SpreadPlayers;
|
|||
import alisolarflare.easyuhc.commands.StartTimer;
|
||||
import alisolarflare.easyuhc.commands.StartUHC;
|
||||
import alisolarflare.easyuhc.commands.TeleportToUHC;
|
||||
import alisolarflare.easyuhc.gpowers.GPowerMemory;
|
||||
import alisolarflare.easyuhc.gpowers.commands.GPower;
|
||||
import alisolarflare.easyuhc.gpowers.commands.PowerDown;
|
||||
import alisolarflare.easyuhc.gpowers.commands.PowerUp;
|
||||
import alisolarflare.easyuhc.gpowers.listeners.gPowerListener;
|
||||
|
||||
public class EasyUHCModule extends Module{
|
||||
public Location lobbyLocation;
|
||||
@Override
|
||||
public void register(JavaPlugin plugin) {
|
||||
|
||||
|
||||
GPowerMemory gPowerMemory = new GPowerMemory();
|
||||
registerCommand(plugin, new GPower(gPowerMemory));
|
||||
registerCommand(plugin, new PowerUp(gPowerMemory));
|
||||
registerCommand(plugin, new PowerDown(gPowerMemory));
|
||||
|
||||
registerListener(plugin, new gPowerListener(plugin, gPowerMemory));
|
||||
|
||||
registerCommand(plugin, new ActivatePowers());
|
||||
registerCommand(plugin, new SetUHCLobby(this));
|
||||
registerCommand(plugin, new SetWorldBorders());
|
||||
|
@ -24,5 +38,6 @@ public class EasyUHCModule extends Module{
|
|||
registerCommand(plugin, new StartTimer());
|
||||
registerCommand(plugin, new StartUHC());
|
||||
registerCommand(plugin, new TeleportToUHC());
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
package alisolarflare.easyuhc.gpowers;
|
||||
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import alisolarflare.Module;
|
||||
import alisolarflare.easyuhc.gpowers.commands.GPower;
|
||||
import alisolarflare.easyuhc.gpowers.commands.PowerDown;
|
||||
import alisolarflare.easyuhc.gpowers.commands.PowerUp;
|
||||
import alisolarflare.easyuhc.gpowers.listeners.gPowerListener;
|
||||
|
||||
public class GPowerModule extends Module {
|
||||
|
||||
@Override
|
||||
public void register(JavaPlugin plugin) {
|
||||
GPowerMemory gPowerMemory = new GPowerMemory();
|
||||
registerCommand(plugin, new GPower(gPowerMemory));
|
||||
registerCommand(plugin, new PowerUp(gPowerMemory));
|
||||
registerCommand(plugin, new PowerDown(gPowerMemory));
|
||||
|
||||
registerListener(plugin, new gPowerListener(plugin, gPowerMemory));
|
||||
}
|
||||
|
||||
}
|
28
src/alisolarflare/easyuhc/gpowers/commands/PowerAll.java
Normal file
28
src/alisolarflare/easyuhc/gpowers/commands/PowerAll.java
Normal file
|
@ -0,0 +1,28 @@
|
|||
package alisolarflare.easyuhc.gpowers.commands;
|
||||
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
import alisolarflare.DevCommand;
|
||||
import alisolarflare.easyuhc.gpowers.GPowerMemory;
|
||||
import alisolarflare.easyuhc.gpowers.GPowerMemory.poweredPlayer;
|
||||
|
||||
public class PowerAll extends DevCommand{
|
||||
private GPowerMemory gPowerMemory;
|
||||
|
||||
public PowerAll(GPowerMemory gPowerMemory) {
|
||||
this.gPowerMemory = gPowerMemory;
|
||||
}
|
||||
@Override
|
||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
||||
for (poweredPlayer poweredPlayer : gPowerMemory.poweredPlayerList.values()){
|
||||
poweredPlayer.isPowersActive = true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] GetHelpText(String alias) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
}
|
|
@ -13,7 +13,7 @@ import org.bukkit.scheduler.BukkitRunnable;
|
|||
import alisolarflare.easyuhc.gpowers.GPowerMemory.poweredPlayer;
|
||||
|
||||
public class gPowerApplyingTask extends BukkitRunnable{
|
||||
private int powerLength = 200;
|
||||
private int powerLength = 300;
|
||||
private Server server;
|
||||
private Map<UUID, poweredPlayer> poweredPlayerList;
|
||||
|
||||
|
@ -35,6 +35,9 @@ public class gPowerApplyingTask extends BukkitRunnable{
|
|||
|
||||
private void activatePower(Player player, String colour) {
|
||||
//GREY
|
||||
for (PotionEffect potionEffect : player.getActivePotionEffects()){
|
||||
player.removePotionEffect(potionEffect.getType());
|
||||
}
|
||||
if ((colour.startsWith("grey") || colour.startsWith("gra")) && (player.getWorld().getTime() > 12575 && player.getWorld().getTime() < 22925)){
|
||||
player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, powerLength, 0, true, false, Color.GRAY), true);
|
||||
player.addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, powerLength+100, 0, true, false, Color.GRAY), true);
|
||||
|
|
|
@ -8,6 +8,6 @@ import alisolarflare.easyuhc.gpowers.GPowerMemory;
|
|||
public class gPowerListener implements Listener{
|
||||
|
||||
public gPowerListener(JavaPlugin plugin, GPowerMemory gPowerMemory){
|
||||
new gPowerApplyingTask(plugin.getServer(), gPowerMemory.poweredPlayerList).runTaskTimer(plugin, 190, 190);
|
||||
new gPowerApplyingTask(plugin.getServer(), gPowerMemory.poweredPlayerList).runTaskTimer(plugin, 0, 190);
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue