Redstoner/Modules
Archived
0
Fork 0
Code Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
David Panić
2019-04-17 20:46:21 +02:00
parent 3169fa20a2 f626609115
commit 62cf62adc3
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -26,6 +26,7 @@ sourceSets {
resources { resources {
srcDir 'src/main/java' srcDir 'src/main/java'
include '**/*.cmd' include '**/*.cmd'
include '**/module.info'
} }
} }
} }

2
src/main/java/com/redstoner/modules/chat/Chat.cmd
View File

@@ -84,7 +84,7 @@ command chatonly {
perm utils.chat.chatonly; perm utils.chat.chatonly;
[empty] { [empty] {
run chatonly; run chatonly;
help Shows that you're onlu able to chat, nothing else.; help Shows that you're only able to chat, nothing else.;
type player; type player;
} }
} }

4
src/main/java/com/redstoner/modules/damnspam/DamnSpam.java
View File

@@ -39,7 +39,7 @@ import com.redstoner.modules.Module;
@Commands(CommandHolderType.File) @Commands(CommandHolderType.File)
@AutoRegisterListener @AutoRegisterListener
@Version(major = 5, minor = 0, revision = 0, compatible = 4) @Version(major = 5, minor = 0, revision = 1, compatible = 4)
public class DamnSpam implements Module, Listener { public class DamnSpam implements Module, Listener {
File configFile = new File(Main.plugin.getDataFolder(), "DamnSpam.json"); File configFile = new File(Main.plugin.getDataFolder(), "DamnSpam.json");
@@ -249,7 +249,7 @@ public class DamnSpam implements Module, Listener {
Player sender = event.getPlayer(); Player sender = event.getPlayer();
String typeStr = block.getType().toString().toLowerCase().replace("_", " "); String typeStr = block.getType().toString().toLowerCase().replace("_", " ");
String inputStr = (block.getLocation().equals(event.getBlock()) ? "this " + typeStr : "the " + typeStr + " attached to that block"); String inputStr = (block.getLocation().equals(event.getBlock().getLocation()) ? "this " + typeStr : "the " + typeStr + " attached to that block");
if (!sender.isSneaking()) { if (!sender.isSneaking()) {
getLogger().message(sender, true, "You cannot destroy " + inputStr); getLogger().message(sender, true, "You cannot destroy " + inputStr);

4
src/main/java/com/redstoner/modules/discord/Discord.java
View File

@@ -25,7 +25,7 @@ import com.redstoner.modules.Module;
import net.nemez.chatapi.click.Message; import net.nemez.chatapi.click.Message;
@Commands(CommandHolderType.File) @Commands(CommandHolderType.File)
@Version(major = 5, minor = 0, revision = 2, compatible = 4) @Version(major = 5, minor = 0, revision = 3, compatible = 4)
public class Discord implements Module { public class Discord implements Module {
private MysqlTable table; private MysqlTable table;
@@ -115,7 +115,7 @@ public class Discord implements Module {
} }
new Message(sender, null).appendText("\n&cRedstoner&7 has a &2Discord&7 Now! \nClick ") new Message(sender, null).appendText("\n&cRedstoner&7 has a &2Discord&7 Now! \nClick ")
.appendLinkHover("&e" + inviteLink, inviteLink, "&aClick to Join").appendText("&7 to join. \n\nTo sync you rank, copy ") .appendLinkHover("&e" + inviteLink, inviteLink, "&aClick to Join").appendText("&7 to join. \n\nTo sync your rank, copy ")
.appendSuggestHover("&e" + token, token, "&aClick to Copy").appendText("&7 into &3#rank-sync&7.\n").send(); .appendSuggestHover("&e" + token, token, "&aClick to Copy").appendText("&7 into &3#rank-sync&7.\n").send();
} }

5
src/main/java/com/redstoner/modules/survival/Survival.java
View File

@@ -20,15 +20,12 @@ import com.redstoner.misc.Main;
import com.redstoner.modules.Module; import com.redstoner.modules.Module;
import com.redstoner.modules.datamanager.DataManager; import com.redstoner.modules.datamanager.DataManager;
import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent;
import net.nemez.chatapi.ChatAPI; import net.nemez.chatapi.ChatAPI;
@Commands(CommandHolderType.File) @Commands(CommandHolderType.File)
@AutoRegisterListener @AutoRegisterListener
@Version(major = 5, minor = 0, revision = 7, compatible = 4) @Version(major = 5, minor = 0, revision = 8, compatible = 4)
public class Survival implements Module, Listener { public class Survival implements Module, Listener {
@EventHandler @EventHandler
public void onPlayerTeleport(PlayerTeleportEvent e) { public void onPlayerTeleport(PlayerTeleportEvent e) {
if (e.getPlayer().getGameMode() != GameMode.SURVIVAL) if (e.getPlayer().getGameMode() != GameMode.SURVIVAL)